[MediaWiki-commits] [Gerrit] css-sanitizer[master]: build: Updating mediawiki/mediawiki-codesniffer to 14.1.0

2017-10-21 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/385528 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 14.1.0
..


build: Updating mediawiki/mediawiki-codesniffer to 14.1.0

And moved phpcs.xml to .phpcs.xml (T177256).

Change-Id: I11dae8308f1c49d576efb6dd29e5ec477da9
---
R .phpcs.xml
M composer.json
M src/Grammar/BlockMatcher.php
M src/Grammar/FunctionMatcher.php
M src/Grammar/Match.php
M src/Grammar/NothingMatcher.php
M src/Objects/Rule.php
M src/Objects/Stylesheet.php
M src/Parser/Parser.php
M src/Sanitizer/FontFeatureValueAtRuleSanitizer.php
M src/Sanitizer/ImportAtRuleSanitizer.php
M src/Sanitizer/MediaAtRuleSanitizer.php
M src/Sanitizer/PropertySanitizer.php
M tests/Grammar/CheckedMatcherTest.php
M tests/Grammar/UrlMatcherTest.php
M tests/Parser/ParserTest.php
M tests/Sanitizer/PropertySanitizerTest.php
M tests/Sanitizer/RuleSanitizerTestBase.php
M tests/Sanitizer/StylePropertySanitizerTest.php
19 files changed, 1 insertion(+), 21 deletions(-)

Approvals:
  Umherirrender: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/phpcs.xml b/.phpcs.xml
similarity index 100%
rename from phpcs.xml
rename to .phpcs.xml
diff --git a/composer.json b/composer.json
index ddf4a21..45a716a 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "0.12.0",
+   "mediawiki/mediawiki-codesniffer": "14.1.0",
"phpunit/phpunit": "4.8.31",
"wikimedia/testing-access-wrapper": "1.0.0"
},
diff --git a/src/Grammar/BlockMatcher.php b/src/Grammar/BlockMatcher.php
index 7126e7b..8126736 100644
--- a/src/Grammar/BlockMatcher.php
+++ b/src/Grammar/BlockMatcher.php
@@ -8,7 +8,6 @@
 
 use Wikimedia\CSS\Objects\ComponentValueList;
 use Wikimedia\CSS\Objects\SimpleBlock;
-use Wikimedia\CSS\Objects\Token;
 
 /**
  * Matcher that matches a SimpleBlock
diff --git a/src/Grammar/FunctionMatcher.php b/src/Grammar/FunctionMatcher.php
index c9584f0..cc03ad7 100644
--- a/src/Grammar/FunctionMatcher.php
+++ b/src/Grammar/FunctionMatcher.php
@@ -8,7 +8,6 @@
 
 use Wikimedia\CSS\Objects\ComponentValueList;
 use Wikimedia\CSS\Objects\CSSFunction;
-use Wikimedia\CSS\Objects\Token;
 
 /**
  * Matcher that matches a CSSFunction
diff --git a/src/Grammar/Match.php b/src/Grammar/Match.php
index c51b784..dc61bb6 100644
--- a/src/Grammar/Match.php
+++ b/src/Grammar/Match.php
@@ -8,8 +8,6 @@
 
 use Wikimedia\CSS\Objects\ComponentValue;
 use Wikimedia\CSS\Objects\ComponentValueList;
-use Wikimedia\CSS\Objects\CSSFunction;
-use Wikimedia\CSS\Objects\SimpleBlock;
 use Wikimedia\CSS\Objects\Token;
 use Wikimedia\CSS\Util;
 
diff --git a/src/Grammar/NothingMatcher.php b/src/Grammar/NothingMatcher.php
index 029cbff..8963aa5 100644
--- a/src/Grammar/NothingMatcher.php
+++ b/src/Grammar/NothingMatcher.php
@@ -6,7 +6,6 @@
 
 namespace Wikimedia\CSS\Grammar;
 
-use Wikimedia\CSS\Objects\ComponentValue;
 use Wikimedia\CSS\Objects\ComponentValueList;
 
 /**
diff --git a/src/Objects/Rule.php b/src/Objects/Rule.php
index cffe8cc..72e6350 100644
--- a/src/Objects/Rule.php
+++ b/src/Objects/Rule.php
@@ -6,8 +6,6 @@
 
 namespace Wikimedia\CSS\Objects;
 
-use Wikimedia\CSS\Util;
-
 /**
  * Represent an abstract CSS rule
  */
diff --git a/src/Objects/Stylesheet.php b/src/Objects/Stylesheet.php
index f8b9692..d99ed12 100644
--- a/src/Objects/Stylesheet.php
+++ b/src/Objects/Stylesheet.php
@@ -7,7 +7,6 @@
 namespace Wikimedia\CSS\Objects;
 
 use Wikimedia\CSS\Util;
-use Wikimedia\CSS\Sanitizer\Sanitizer;
 
 /**
  * Represent a stylesheet
diff --git a/src/Parser/Parser.php b/src/Parser/Parser.php
index 55368a4..f7d133c 100644
--- a/src/Parser/Parser.php
+++ b/src/Parser/Parser.php
@@ -19,7 +19,6 @@
 use Wikimedia\CSS\Objects\SimpleBlock;
 use Wikimedia\CSS\Objects\Stylesheet;
 use Wikimedia\CSS\Objects\Token;
-use Wikimedia\CSS\Sanitizer\Sanitizer;
 
 // Note: While reading the code below, you might find that my calls to
 // consumeToken() don't match what the spec says and I don't ever "reconsume" a
diff --git a/src/Sanitizer/FontFeatureValueAtRuleSanitizer.php 
b/src/Sanitizer/FontFeatureValueAtRuleSanitizer.php
index a9207fa..1be4ae7 100644
--- a/src/Sanitizer/FontFeatureValueAtRuleSanitizer.php
+++ b/src/Sanitizer/FontFeatureValueAtRuleSanitizer.php
@@ -9,7 +9,6 @@
 use Wikimedia\CSS\Grammar\Matcher;
 use Wikimedia\CSS\Objects\AtRule;
 use Wikimedia\CSS\Objects\CSSObject;
-use Wikimedia\CSS\Objects\ComponentValueList;
 use Wikimedia\CSS\Objects\DeclarationList;
 use Wikimedia\CSS\Objects\Rule;
 use Wikimedia\CSS\Parser\Parser;
diff --git a/src/Sanitizer/ImportAtRuleSanitizer.php 
b/src/Sanitizer/ImportAtRuleSanitizer.php
index c3360c3..b8ab1c6 100644
--- a/src/Sanitizer/ImportAtRuleSanitizer.php
+++

[MediaWiki-commits] [Gerrit] css-sanitizer[master]: build: Updating mediawiki/mediawiki-codesniffer to 14.1.0

2017-10-20 Thread Libraryupgrader (Code Review) 
Libraryupgrader has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/385528 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 14.1.0
..

build: Updating mediawiki/mediawiki-codesniffer to 14.1.0

And moved phpcs.xml to .phpcs.xml (T177256).

Change-Id: I11dae8308f1c49d576efb6dd29e5ec477da9
---
R .phpcs.xml
M composer.json
M src/Grammar/BlockMatcher.php
M src/Grammar/FunctionMatcher.php
M src/Grammar/Match.php
M src/Grammar/NothingMatcher.php
M src/Objects/Rule.php
M src/Objects/Stylesheet.php
M src/Parser/Parser.php
M src/Sanitizer/FontFeatureValueAtRuleSanitizer.php
M src/Sanitizer/ImportAtRuleSanitizer.php
M src/Sanitizer/MediaAtRuleSanitizer.php
M src/Sanitizer/PropertySanitizer.php
M tests/Grammar/CheckedMatcherTest.php
M tests/Grammar/UrlMatcherTest.php
M tests/Parser/ParserTest.php
M tests/Sanitizer/PropertySanitizerTest.php
M tests/Sanitizer/RuleSanitizerTestBase.php
M tests/Sanitizer/StylePropertySanitizerTest.php
19 files changed, 1 insertion(+), 21 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/css-sanitizer 
refs/changes/28/385528/1

diff --git a/phpcs.xml b/.phpcs.xml
similarity index 100%
rename from phpcs.xml
rename to .phpcs.xml
diff --git a/composer.json b/composer.json
index ddf4a21..45a716a 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "0.12.0",
+   "mediawiki/mediawiki-codesniffer": "14.1.0",
"phpunit/phpunit": "4.8.31",
"wikimedia/testing-access-wrapper": "1.0.0"
},
diff --git a/src/Grammar/BlockMatcher.php b/src/Grammar/BlockMatcher.php
index 7126e7b..8126736 100644
--- a/src/Grammar/BlockMatcher.php
+++ b/src/Grammar/BlockMatcher.php
@@ -8,7 +8,6 @@
 
 use Wikimedia\CSS\Objects\ComponentValueList;
 use Wikimedia\CSS\Objects\SimpleBlock;
-use Wikimedia\CSS\Objects\Token;
 
 /**
  * Matcher that matches a SimpleBlock
diff --git a/src/Grammar/FunctionMatcher.php b/src/Grammar/FunctionMatcher.php
index c9584f0..cc03ad7 100644
--- a/src/Grammar/FunctionMatcher.php
+++ b/src/Grammar/FunctionMatcher.php
@@ -8,7 +8,6 @@
 
 use Wikimedia\CSS\Objects\ComponentValueList;
 use Wikimedia\CSS\Objects\CSSFunction;
-use Wikimedia\CSS\Objects\Token;
 
 /**
  * Matcher that matches a CSSFunction
diff --git a/src/Grammar/Match.php b/src/Grammar/Match.php
index c51b784..dc61bb6 100644
--- a/src/Grammar/Match.php
+++ b/src/Grammar/Match.php
@@ -8,8 +8,6 @@
 
 use Wikimedia\CSS\Objects\ComponentValue;
 use Wikimedia\CSS\Objects\ComponentValueList;
-use Wikimedia\CSS\Objects\CSSFunction;
-use Wikimedia\CSS\Objects\SimpleBlock;
 use Wikimedia\CSS\Objects\Token;
 use Wikimedia\CSS\Util;
 
diff --git a/src/Grammar/NothingMatcher.php b/src/Grammar/NothingMatcher.php
index 029cbff..8963aa5 100644
--- a/src/Grammar/NothingMatcher.php
+++ b/src/Grammar/NothingMatcher.php
@@ -6,7 +6,6 @@
 
 namespace Wikimedia\CSS\Grammar;
 
-use Wikimedia\CSS\Objects\ComponentValue;
 use Wikimedia\CSS\Objects\ComponentValueList;
 
 /**
diff --git a/src/Objects/Rule.php b/src/Objects/Rule.php
index cffe8cc..72e6350 100644
--- a/src/Objects/Rule.php
+++ b/src/Objects/Rule.php
@@ -6,8 +6,6 @@
 
 namespace Wikimedia\CSS\Objects;
 
-use Wikimedia\CSS\Util;
-
 /**
  * Represent an abstract CSS rule
  */
diff --git a/src/Objects/Stylesheet.php b/src/Objects/Stylesheet.php
index f8b9692..d99ed12 100644
--- a/src/Objects/Stylesheet.php
+++ b/src/Objects/Stylesheet.php
@@ -7,7 +7,6 @@
 namespace Wikimedia\CSS\Objects;
 
 use Wikimedia\CSS\Util;
-use Wikimedia\CSS\Sanitizer\Sanitizer;
 
 /**
  * Represent a stylesheet
diff --git a/src/Parser/Parser.php b/src/Parser/Parser.php
index 55368a4..f7d133c 100644
--- a/src/Parser/Parser.php
+++ b/src/Parser/Parser.php
@@ -19,7 +19,6 @@
 use Wikimedia\CSS\Objects\SimpleBlock;
 use Wikimedia\CSS\Objects\Stylesheet;
 use Wikimedia\CSS\Objects\Token;
-use Wikimedia\CSS\Sanitizer\Sanitizer;
 
 // Note: While reading the code below, you might find that my calls to
 // consumeToken() don't match what the spec says and I don't ever "reconsume" a
diff --git a/src/Sanitizer/FontFeatureValueAtRuleSanitizer.php 
b/src/Sanitizer/FontFeatureValueAtRuleSanitizer.php
index a9207fa..1be4ae7 100644
--- a/src/Sanitizer/FontFeatureValueAtRuleSanitizer.php
+++ b/src/Sanitizer/FontFeatureValueAtRuleSanitizer.php
@@ -9,7 +9,6 @@
 use Wikimedia\CSS\Grammar\Matcher;
 use Wikimedia\CSS\Objects\AtRule;
 use Wikimedia\CSS\Objects\CSSObject;
-use Wikimedia\CSS\Objects\ComponentValueList;
 use Wikimedia\CSS\Objects\DeclarationList;
 use Wikimedia\CSS\Objects\Rule;
 use Wikimedia\CSS\Parser\Parser;
diff --git a/src/Sanitizer/ImportAtRuleSanitizer.php 
b/src/Sanitizer/ImportAtRuleSanitizer.php
index c3360c3..b8ab1c6 100644
--- a/src/Sanitizer/ImportAtRuleSanitizer.php
+++