[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Disallow PHP 7.2+ `object` type-hint

2018-01-01 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401044 )

Change subject: Disallow PHP 7.2+ `object` type-hint
..


Disallow PHP 7.2+ `object` type-hint

https://wiki.php.net/rfc/object-typehint

Change-Id: Ie9606692c1fde43280d9a59fc20b63261761a1eb
---
M MediaWiki/Sniffs/Usage/ScalarTypeHintUsageSniff.php
M MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php
M MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php.expect
M MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php.fixed
4 files changed, 28 insertions(+), 3 deletions(-)

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



diff --git a/MediaWiki/Sniffs/Usage/ScalarTypeHintUsageSniff.php 
b/MediaWiki/Sniffs/Usage/ScalarTypeHintUsageSniff.php
index 2705621..21ac47b 100644
--- a/MediaWiki/Sniffs/Usage/ScalarTypeHintUsageSniff.php
+++ b/MediaWiki/Sniffs/Usage/ScalarTypeHintUsageSniff.php
@@ -25,7 +25,12 @@
 
 class ScalarTypeHintUsageSniff implements Sniff {
 
-   private static $bad = [ 'string', 'int', 'float', 'bool' ];
+   private static $bad = [
+   // PHP 7.0+
+   'string', 'int', 'float', 'bool',
+   // PHP 7.2+
+   'object',
+   ];
 
/**
 * Run on functions
diff --git a/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php 
b/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php
index 05087a3..1b6438d 100644
--- a/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php
+++ b/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php
@@ -9,3 +9,12 @@
 function wfFoo( int $a, $b ) {
$b = $a;
 }
+
+/**
+ * A bar
+ *
+ * @param object $a Stuff
+ */
+function wfBar( object $a ) {
+   $c = $a;
+}
diff --git a/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php.expect 
b/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php.expect
index f076050..e510a1d 100644
--- a/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php.expect
+++ b/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php.expect
@@ -1,2 +1,4 @@
- 9 | ERROR | Scalar type hint of 'int' cannot be used
-   |   | (MediaWiki.Usage.ScalarTypeHintUsage.Found)
+  9 | ERROR | Scalar type hint of 'int' cannot be used
+|   | (MediaWiki.Usage.ScalarTypeHintUsage.Found)
+ 18 | ERROR | Scalar type hint of 'object' cannot be used
+|   | (MediaWiki.Usage.ScalarTypeHintUsage.Found)
diff --git a/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php.fixed 
b/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php.fixed
index 05087a3..1b6438d 100644
--- a/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php.fixed
+++ b/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php.fixed
@@ -9,3 +9,12 @@
 function wfFoo( int $a, $b ) {
$b = $a;
 }
+
+/**
+ * A bar
+ *
+ * @param object $a Stuff
+ */
+function wfBar( object $a ) {
+   $c = $a;
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/401044
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9606692c1fde43280d9a59fc20b63261761a1eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Disallow PHP 7.2+ `object` type-hint

2017-12-30 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401044 )

Change subject: Disallow PHP 7.2+ `object` type-hint
..

Disallow PHP 7.2+ `object` type-hint

https://wiki.php.net/rfc/object-typehint

Change-Id: Ie9606692c1fde43280d9a59fc20b63261761a1eb
---
M MediaWiki/Sniffs/Usage/ScalarTypeHintUsageSniff.php
M MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php
M MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php.expect
M MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php.fixed
4 files changed, 28 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/codesniffer 
refs/changes/44/401044/1

diff --git a/MediaWiki/Sniffs/Usage/ScalarTypeHintUsageSniff.php 
b/MediaWiki/Sniffs/Usage/ScalarTypeHintUsageSniff.php
index 2705621..21ac47b 100644
--- a/MediaWiki/Sniffs/Usage/ScalarTypeHintUsageSniff.php
+++ b/MediaWiki/Sniffs/Usage/ScalarTypeHintUsageSniff.php
@@ -25,7 +25,12 @@
 
 class ScalarTypeHintUsageSniff implements Sniff {
 
-   private static $bad = [ 'string', 'int', 'float', 'bool' ];
+   private static $bad = [
+   // PHP 7.0+
+   'string', 'int', 'float', 'bool',
+   // PHP 7.2+
+   'object',
+   ];
 
/**
 * Run on functions
diff --git a/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php 
b/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php
index 05087a3..1b6438d 100644
--- a/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php
+++ b/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php
@@ -9,3 +9,12 @@
 function wfFoo( int $a, $b ) {
$b = $a;
 }
+
+/**
+ * A bar
+ *
+ * @param object $a Stuff
+ */
+function wfBar( object $a ) {
+   $c = $a;
+}
diff --git a/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php.expect 
b/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php.expect
index f076050..e510a1d 100644
--- a/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php.expect
+++ b/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php.expect
@@ -1,2 +1,4 @@
- 9 | ERROR | Scalar type hint of 'int' cannot be used
-   |   | (MediaWiki.Usage.ScalarTypeHintUsage.Found)
+  9 | ERROR | Scalar type hint of 'int' cannot be used
+|   | (MediaWiki.Usage.ScalarTypeHintUsage.Found)
+ 18 | ERROR | Scalar type hint of 'object' cannot be used
+|   | (MediaWiki.Usage.ScalarTypeHintUsage.Found)
diff --git a/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php.fixed 
b/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php.fixed
index 05087a3..1b6438d 100644
--- a/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php.fixed
+++ b/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php.fixed
@@ -9,3 +9,12 @@
 function wfFoo( int $a, $b ) {
$b = $a;
 }
+
+/**
+ * A bar
+ *
+ * @param object $a Stuff
+ */
+function wfBar( object $a ) {
+   $c = $a;
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/401044
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9606692c1fde43280d9a59fc20b63261761a1eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits