[MediaWiki-commits] [Gerrit] Remove the phplint.sh dev script - change (mediawiki...MobileFrontend)

2015-05-28 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Remove the phplint.sh dev script
..


Remove the phplint.sh dev script

The phplint.sh dev script has been superseded by the `test` Composer
script.

Change-Id: If5cd278ef6c2475caea45416d532d93d1debd82c
---
M Makefile
D dev-scripts/phplint.sh
2 files changed, 1 insertion(+), 26 deletions(-)

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



diff --git a/Makefile b/Makefile
index 0e9cad2..c5f9957 100644
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,7 @@
@dev-scripts/phpcheck.sh
 
 phplint: phpcheck  ## Lint the PHP files
-   @dev-scripts/phplint.sh
+   @php composer.phar test
 
 phpunit:   ## Run the PHPUnit test suite
cd ${MW_INSTALL_PATH}/tests/phpunit  php phpunit.php --group 
MobileFrontend ${MW_INSTALL_PATH}/extensions/MobileFrontend/tests/phpunit
diff --git a/dev-scripts/phplint.sh b/dev-scripts/phplint.sh
deleted file mode 100755
index 9b0e500..000
--- a/dev-scripts/phplint.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-command -v vendor/bin/phpcs /dev/null 21 || { echo 2 phpcs required but 
it's not installed. Aborting. Run 'make phpcheck'; exit 1; }
-
-if [ -z ${MEDIAWIKI_CODESNIFFER_CONFIG_DIR+x} ]
-   then
-   echo MEDIAWIKI_CODESNIFFER_CONFIG_DIR is unset
-   echo Please setup mediawiki/tools/codesniffer
-   echo Then add 'export 
MEDIAWIKI_CODESNIFFER_CONFIG_DIR=path/MediaWiki'
-   exit 1
-fi
-
-for file in `find . -name '*.php' -not -path './node_modules/*' -not -path 
'./vendor/*'`; do
-   RESULTS=`php -l $file`
-   if [ $RESULTS != No syntax errors detected in $file ]; then
-   echo $RESULTS
-   exit 1
-   fi
-
-   vendor/bin/phpcs $file --standard=$MEDIAWIKI_CODESNIFFER_CONFIG_DIR
-   if [ $? -ne 0 ]; then
-   exit 1
-   fi
-done
-

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If5cd278ef6c2475caea45416d532d93d1debd82c
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Phuedx g...@samsmith.io
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Remove the phplint.sh dev script - change (mediawiki...MobileFrontend)

2015-05-28 Thread Phuedx (Code Review) 
Phuedx has uploaded a new change for review.

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

Change subject: Remove the phplint.sh dev script
..

Remove the phplint.sh dev script

The phplint.sh dev script has been superseded by the `test` Composer
script.

Change-Id: If5cd278ef6c2475caea45416d532d93d1debd82c
---
M Makefile
D dev-scripts/phplint.sh
2 files changed, 1 insertion(+), 26 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/25/214325/1

diff --git a/Makefile b/Makefile
index 229684c..7fc00df 100644
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,7 @@
@dev-scripts/phpcheck.sh
 
 phplint: phpcheck  ## Lint the PHP files
-   @dev-scripts/phplint.sh
+   @composer test
 
 phpunit:   ## Run the PHPUnit test suite
cd ${MW_INSTALL_PATH}/tests/phpunit  php phpunit.php --group 
MobileFrontend ${MW_INSTALL_PATH}/extensions/MobileFrontend/tests/phpunit
diff --git a/dev-scripts/phplint.sh b/dev-scripts/phplint.sh
deleted file mode 100755
index 9b0e500..000
--- a/dev-scripts/phplint.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-command -v vendor/bin/phpcs /dev/null 21 || { echo 2 phpcs required but 
it's not installed. Aborting. Run 'make phpcheck'; exit 1; }
-
-if [ -z ${MEDIAWIKI_CODESNIFFER_CONFIG_DIR+x} ]
-   then
-   echo MEDIAWIKI_CODESNIFFER_CONFIG_DIR is unset
-   echo Please setup mediawiki/tools/codesniffer
-   echo Then add 'export 
MEDIAWIKI_CODESNIFFER_CONFIG_DIR=path/MediaWiki'
-   exit 1
-fi
-
-for file in `find . -name '*.php' -not -path './node_modules/*' -not -path 
'./vendor/*'`; do
-   RESULTS=`php -l $file`
-   if [ $RESULTS != No syntax errors detected in $file ]; then
-   echo $RESULTS
-   exit 1
-   fi
-
-   vendor/bin/phpcs $file --standard=$MEDIAWIKI_CODESNIFFER_CONFIG_DIR
-   if [ $? -ne 0 ]; then
-   exit 1
-   fi
-done
-

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If5cd278ef6c2475caea45416d532d93d1debd82c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Phuedx g...@samsmith.io

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