Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix the last Generic.Files.LineLength phpcs failures

Browse source 
In both cases the long lines are inside method documentation,
and because @codingStandardsIgnoreStart comments only
work with // and not /*, they have to be outside the method comment.

Bug: T102614
Bug: T114213
Change-Id: I7343e1cf662c5bf12a5e4385646c5c2c4a798260
This commit is contained in:
Amir E. Aharoni 2015-10-03 21:02:55 +03:00 committed by Reedy
parent c50cbe48ab
commit 4490b5b5ec
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
includes/media/XMP.php
View file

@ -1269,6 +1269,7 @@ class XMPReader implements LoggerAwareInterface {
} }
} }
// @codingStandardsIgnoreStart Generic.Files.LineLength
/** /**
* Process attributes. * Process attributes.
* Simple values can be stored as either a tag or attribute * Simple values can be stored as either a tag or attribute
@ -1276,16 +1277,15 @@ class XMPReader implements LoggerAwareInterface {
* Often the initial "<rdf:Description>" tag just has all the simple * Often the initial "<rdf:Description>" tag just has all the simple
* properties as attributes. * properties as attributes.
* *
* @codingStandardsIgnoreStart Long line that cannot be broken
* @par Example: * @par Example:
* @code * @code
* <rdf:Description rdf:about="" xmlns:exif="http://ns.adobe.com/exif/1.0/" exif:DigitalZoomRatio="0/10"> * <rdf:Description rdf:about="" xmlns:exif="http://ns.adobe.com/exif/1.0/" exif:DigitalZoomRatio="0/10">
* @endcode * @endcode
* @codingStandardsIgnoreEnd
* *
* @param array $attribs Array attribute=>value * @param array $attribs Array attribute=>value
* @throws RuntimeException * @throws RuntimeException
*/ */
// @codingStandardsIgnoreEnd
private function doAttribs( $attribs ) { private function doAttribs( $attribs ) {
// first check for rdf:parseType attribute, as that can change // first check for rdf:parseType attribute, as that can change
// how the attributes are interperted. // how the attributes are interperted.

6
tests/phpunit/includes/SampleTest.php
View file

@ -57,12 +57,12 @@ class TestSample extends MediaWikiLangTestCase {
); );
} }
// @codingStandardsIgnoreStart Generic.Files.LineLength
/** /**
* @dataProvider provideTitles * @dataProvider provideTitles
* @codingStandardsIgnoreStart Ignore long line warning
* See http://phpunit.de/manual/3.7/en/appendixes.annotations.html#appendixes.annotations.dataProvider * See http://phpunit.de/manual/3.7/en/appendixes.annotations.html#appendixes.annotations.dataProvider
* @codingStandardsIgnoreEnd
*/ */
// @codingStandardsIgnoreEnd
public function testCreateBasicListOfTitles( $titleName, $ns, $text ) { public function testCreateBasicListOfTitles( $titleName, $ns, $text ) {
$title = Title::newFromText( $titleName, $ns ); $title = Title::newFromText( $titleName, $ns );
$this->assertEquals( $text, "$title", "see if '$titleName' matches '$text'" ); $this->assertEquals( $text, "$title", "see if '$titleName' matches '$text'" );
@ -95,7 +95,7 @@ class TestSample extends MediaWikiLangTestCase {
$this->assertTrue( $title->isLocal() ); $this->assertTrue( $title->isLocal() );
} }
// @codingStandardsIgnoreStart Ignore long line warning // @codingStandardsIgnoreStart Generic.Files.LineLength
/** /**
* @expectedException InvalidArgumentException * @expectedException InvalidArgumentException
* See http://phpunit.de/manual/3.7/en/appendixes.annotations.html#appendixes.annotations.expectedException * See http://phpunit.de/manual/3.7/en/appendixes.annotations.html#appendixes.annotations.expectedException