[MediaWiki-commits] [Gerrit] findHooks.php: Work also on .inc and .php5 - change (mediawiki/core)

2016-06-13 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: findHooks.php: Work also on .inc and .php5
..


findHooks.php: Work also on .inc and .php5

Also fix the use of RecursiveDirectoryIterator::SKIP_DOTS, which was 
passed to the wrong constructor.

Follows I29280dfe629126c71adfb65ac1a59394bc459dc4
Follows I6c01b8768f9f70152e320d254f8025a0ffde8c62

Change-Id: Ib35ca10b809afd5f6da80cd5edd1a71479c917a7
(cherry picked from commit cf809902747d2ca1f055d7d1e57336e183cd2a95)
---
M maintenance/findHooks.php
1 file changed, 4 insertions(+), 5 deletions(-)

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



diff --git a/maintenance/findHooks.php b/maintenance/findHooks.php
index 89e0311..bc36141 100644
--- a/maintenance/findHooks.php
+++ b/maintenance/findHooks.php
@@ -305,17 +305,16 @@
 
if ( $recurse === self::FIND_RECURSIVE ) {
$iterator = new RecursiveIteratorIterator(
-   new RecursiveDirectoryIterator( $dir ),
-   RecursiveIteratorIterator::SELF_FIRST | 
RecursiveDirectoryIterator::SKIP_DOTS
+   new RecursiveDirectoryIterator( $dir, 
RecursiveDirectoryIterator::SKIP_DOTS ),
+   RecursiveIteratorIterator::SELF_FIRST
);
} else {
$iterator = new DirectoryIterator( $dir );
}
 
foreach ( $iterator as $info ) {
-   // Ignore directories, ignore json (installer and api 
i18n),
-   // ignore extension-less files like HISTORY
-   if ( $info->isFile() && $info->getExtension() === 'php'
+   // Ignore directories, work only on php files,
+   if ( $info->isFile() && in_array( 
$info->getExtension(), [ 'php', 'php5', 'inc' ] )
// Skip this file as it contains text that 
looks like a bad wfRunHooks() call
&& $info->getRealPath() !== __FILE__
) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib35ca10b809afd5f6da80cd5edd1a71479c917a7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Parent5446 
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] findHooks.php: Work also on .inc and .php5 - change (mediawiki/core)

2016-06-13 Thread Chad (Code Review) 
Chad has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/294094

Change subject: findHooks.php: Work also on .inc and .php5
..

findHooks.php: Work also on .inc and .php5

Also fix the use of RecursiveDirectoryIterator::SKIP_DOTS, which was 
passed to the wrong constructor.

Follows I29280dfe629126c71adfb65ac1a59394bc459dc4
Follows I6c01b8768f9f70152e320d254f8025a0ffde8c62

Change-Id: Ib35ca10b809afd5f6da80cd5edd1a71479c917a7
(cherry picked from commit cf809902747d2ca1f055d7d1e57336e183cd2a95)
---
M maintenance/findHooks.php
1 file changed, 4 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/94/294094/1

diff --git a/maintenance/findHooks.php b/maintenance/findHooks.php
index 89e0311..bc36141 100644
--- a/maintenance/findHooks.php
+++ b/maintenance/findHooks.php
@@ -305,17 +305,16 @@
 
if ( $recurse === self::FIND_RECURSIVE ) {
$iterator = new RecursiveIteratorIterator(
-   new RecursiveDirectoryIterator( $dir ),
-   RecursiveIteratorIterator::SELF_FIRST | 
RecursiveDirectoryIterator::SKIP_DOTS
+   new RecursiveDirectoryIterator( $dir, 
RecursiveDirectoryIterator::SKIP_DOTS ),
+   RecursiveIteratorIterator::SELF_FIRST
);
} else {
$iterator = new DirectoryIterator( $dir );
}
 
foreach ( $iterator as $info ) {
-   // Ignore directories, ignore json (installer and api 
i18n),
-   // ignore extension-less files like HISTORY
-   if ( $info->isFile() && $info->getExtension() === 'php'
+   // Ignore directories, work only on php files,
+   if ( $info->isFile() && in_array( 
$info->getExtension(), [ 'php', 'php5', 'inc' ] )
// Skip this file as it contains text that 
looks like a bad wfRunHooks() call
&& $info->getRealPath() !== __FILE__
) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib35ca10b809afd5f6da80cd5edd1a71479c917a7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Chad 
Gerrit-Reviewer: Umherirrender 

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

[MediaWiki-commits] [Gerrit] findHooks.php: Work also on .inc and .php5 - change (mediawiki/core)

2016-06-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: findHooks.php: Work also on .inc and .php5
..


findHooks.php: Work also on .inc and .php5

Also fix the use of RecursiveDirectoryIterator::SKIP_DOTS, which was 
passed to the wrong constructor.

Follows I29280dfe629126c71adfb65ac1a59394bc459dc4
Follows I6c01b8768f9f70152e320d254f8025a0ffde8c62

Change-Id: Ib35ca10b809afd5f6da80cd5edd1a71479c917a7
---
M maintenance/findHooks.php
1 file changed, 4 insertions(+), 5 deletions(-)

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



diff --git a/maintenance/findHooks.php b/maintenance/findHooks.php
index 89e0311..bc36141 100644
--- a/maintenance/findHooks.php
+++ b/maintenance/findHooks.php
@@ -305,17 +305,16 @@
 
if ( $recurse === self::FIND_RECURSIVE ) {
$iterator = new RecursiveIteratorIterator(
-   new RecursiveDirectoryIterator( $dir ),
-   RecursiveIteratorIterator::SELF_FIRST | 
RecursiveDirectoryIterator::SKIP_DOTS
+   new RecursiveDirectoryIterator( $dir, 
RecursiveDirectoryIterator::SKIP_DOTS ),
+   RecursiveIteratorIterator::SELF_FIRST
);
} else {
$iterator = new DirectoryIterator( $dir );
}
 
foreach ( $iterator as $info ) {
-   // Ignore directories, ignore json (installer and api 
i18n),
-   // ignore extension-less files like HISTORY
-   if ( $info->isFile() && $info->getExtension() === 'php'
+   // Ignore directories, work only on php files,
+   if ( $info->isFile() && in_array( 
$info->getExtension(), [ 'php', 'php5', 'inc' ] )
// Skip this file as it contains text that 
looks like a bad wfRunHooks() call
&& $info->getRealPath() !== __FILE__
) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib35ca10b809afd5f6da80cd5edd1a71479c917a7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] findHooks.php: Work also on .inc and .php5 - change (mediawiki/core)

2016-06-12 Thread Umherirrender (Code Review) 
Umherirrender has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/293972

Change subject: findHooks.php: Work also on .inc and .php5
..

findHooks.php: Work also on .inc and .php5

Also fix the use of RecursiveDirectoryIterator::SKIP_DOTS, which was 
passed to the wrong constructor.

Follows I29280dfe629126c71adfb65ac1a59394bc459dc4
Follows I6c01b8768f9f70152e320d254f8025a0ffde8c62

Change-Id: Ib35ca10b809afd5f6da80cd5edd1a71479c917a7
---
M maintenance/findHooks.php
1 file changed, 4 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/72/293972/1

diff --git a/maintenance/findHooks.php b/maintenance/findHooks.php
index 89e0311..bc36141 100644
--- a/maintenance/findHooks.php
+++ b/maintenance/findHooks.php
@@ -305,17 +305,16 @@
 
if ( $recurse === self::FIND_RECURSIVE ) {
$iterator = new RecursiveIteratorIterator(
-   new RecursiveDirectoryIterator( $dir ),
-   RecursiveIteratorIterator::SELF_FIRST | 
RecursiveDirectoryIterator::SKIP_DOTS
+   new RecursiveDirectoryIterator( $dir, 
RecursiveDirectoryIterator::SKIP_DOTS ),
+   RecursiveIteratorIterator::SELF_FIRST
);
} else {
$iterator = new DirectoryIterator( $dir );
}
 
foreach ( $iterator as $info ) {
-   // Ignore directories, ignore json (installer and api 
i18n),
-   // ignore extension-less files like HISTORY
-   if ( $info->isFile() && $info->getExtension() === 'php'
+   // Ignore directories, work only on php files,
+   if ( $info->isFile() && in_array( 
$info->getExtension(), [ 'php', 'php5', 'inc' ] )
// Skip this file as it contains text that 
looks like a bad wfRunHooks() call
&& $info->getRealPath() !== __FILE__
) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib35ca10b809afd5f6da80cd5edd1a71479c917a7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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