[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Change bootstrap-ci.php to match PHP CodeSniffer 3.0.0

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

Change subject: Change bootstrap-ci.php to match PHP CodeSniffer 3.0.0
..


Change bootstrap-ci.php to match PHP CodeSniffer 3.0.0

The include position was moved inside PHP CodeSniffer from CLI.php to
Runner.php. The $values is no longer there, changed to $this->config

Follows I2f492f889594135e37950fcb8e40da0c4d088430
Follows I6a934e15fd85aec31b9070c9fbaa34cadd763296

Bug: T172933
Change-Id: Ia75f0212b7704b634220b6dee2f12caa913ca8ba
---
M utils/bootstrap-ci.php
1 file changed, 24 insertions(+), 8 deletions(-)

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



diff --git a/utils/bootstrap-ci.php b/utils/bootstrap-ci.php
index d540c58..e2fdd6c 100644
--- a/utils/bootstrap-ci.php
+++ b/utils/bootstrap-ci.php
@@ -1,6 +1,7 @@
 
  *
@@ -42,33 +43,48 @@
 
 # Changes to phpcs.xml affect all files
 if ( in_array( 'phpcs.xml', $_head_files ) ) {
+   unset( $_head_files );
+   unset( $_return );
return;
 }
 # composer.json might affect mediawiki/mediawiki-codesniffer version
 if ( in_array( 'composer.json', $_head_files ) ) {
exec( 'git show HEAD^:composer.json', $_prev_composer, $_return );
if ( $_return !== 0 ) {
+   unset( $_head_files );
+   unset( $_return );
return;
}
exec( 'git show HEAD:composer.json', $_cur_composer, $_return );
if ( $_return !== 0 ) {
+   unset( $_head_files );
+   unset( $_return );
return;
}
$_prev_composer = json_decode( join( '', $_prev_composer ), true );
$_cur_composer = json_decode( join( '', $_cur_composer ), true );
if ( $_prev_composer['require-dev']['mediawiki/mediawiki-codesniffer']
-   !== 
$_cur_composer['require-dev']['mediawiki/mediawiki-codesniffer'] ) {
+   !== 
$_cur_composer['require-dev']['mediawiki/mediawiki-codesniffer']
+   ) {
+   unset( $_head_files );
+   unset( $_return );
return;
}
 }
 
-# Only keep files that matches phpcs.xml extensions.
-$values['files'] = array_filter( $_head_files, function ( $file ) use ( 
$values ) {
-   $pinfo = pathinfo( $file );
-   return in_array(
-   strtolower( $pinfo['extension'] ), $values['extensions'] );
-} );
-if ( empty( $values['files'] ) ) {
+# Only keep files out of git head that matches phpcs.xml extensions.
+$_extensions = array_keys( $this->config->extensions );
+$this->config->files = array_filter(
+   $_head_files,
+   function ( $file ) use ( $_extensions ) {
+   $pinfo = pathinfo( $file );
+   return in_array( strtolower( $pinfo['extension'] ), 
$_extensions );
+   }
+);
+unset( $_extensions );
+unset( $_head_files );
+unset( $_return );
+if ( empty( $this->config->files ) ) {
echo "No files to process. Skipping run\n";
exit( 0 );
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia75f0212b7704b634220b6dee2f12caa913ca8ba
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
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]: Change bootstrap-ci.php to match PHP CodeSniffer 3.0.0

2017-08-11 Thread Umherirrender (Code Review) 
Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371475 )

Change subject: Change bootstrap-ci.php to match PHP CodeSniffer 3.0.0
..

Change bootstrap-ci.php to match PHP CodeSniffer 3.0.0

The include position was moved inside PHP CodeSniffer from CLI.php to
Runner.php. The $values is no longer there, changed to $this->config

Bug: T172933
Change-Id: Ia75f0212b7704b634220b6dee2f12caa913ca8ba
---
M utils/bootstrap-ci.php
1 file changed, 24 insertions(+), 8 deletions(-)


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

diff --git a/utils/bootstrap-ci.php b/utils/bootstrap-ci.php
index d540c58..1893c58 100644
--- a/utils/bootstrap-ci.php
+++ b/utils/bootstrap-ci.php
@@ -1,6 +1,7 @@
 
  *
@@ -42,33 +43,48 @@
 
 # Changes to phpcs.xml affect all files
 if ( in_array( 'phpcs.xml', $_head_files ) ) {
+   unset( $_head_files );
+   unset( $_return );
return;
 }
 # composer.json might affect mediawiki/mediawiki-codesniffer version
 if ( in_array( 'composer.json', $_head_files ) ) {
exec( 'git show HEAD^:composer.json', $_prev_composer, $_return );
if ( $_return !== 0 ) {
+   unset( $_head_files );
+   unset( $_return );
return;
}
exec( 'git show HEAD:composer.json', $_cur_composer, $_return );
if ( $_return !== 0 ) {
+   unset( $_head_files );
+   unset( $_return );
return;
}
$_prev_composer = json_decode( join( '', $_prev_composer ), true );
$_cur_composer = json_decode( join( '', $_cur_composer ), true );
if ( $_prev_composer['require-dev']['mediawiki/mediawiki-codesniffer']
-   !== 
$_cur_composer['require-dev']['mediawiki/mediawiki-codesniffer'] ) {
+   !== 
$_cur_composer['require-dev']['mediawiki/mediawiki-codesniffer']
+   ) {
+   unset( $_head_files );
+   unset( $_return );
return;
}
 }
 
-# Only keep files that matches phpcs.xml extensions.
-$values['files'] = array_filter( $_head_files, function ( $file ) use ( 
$values ) {
-   $pinfo = pathinfo( $file );
-   return in_array(
-   strtolower( $pinfo['extension'] ), $values['extensions'] );
-} );
-if ( empty( $values['files'] ) ) {
+# Only keep files out of git head that matches phpcs.xml extensions.
+$_extensions = array_keys( $this->config->extensions );
+$this->config->files = array_filter(
+   $_head_files,
+   function ( $file ) use ( $_extensions ) {
+   $pinfo = pathinfo( $file );
+   return in_array( strtolower( $pinfo['extension'] ), 
$_extensions );
+   }
+);
+unset( $_extensions )
+unset( $_head_files );
+unset( $_return );
+if ( empty( $this->config->files ) ) {
echo "No files to process. Skipping run\n";
exit( 0 );
 }

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

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

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