Merge pull request #339 from OpenMage/php-lint-test

Fix errors found via PHP lint.
OpenMage · Aug 31, 2017 · 5dde5ee · 5dde5ee
2 parents 7aedb6e + 92ce727
commit 5dde5ee
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,8 +10,7 @@ matrix:
   allow_failures:
     - php: 7.2
 
-before_script:
-  - '! find . -not \( -path ./lib/PEAR -prune \) -not \( -path ./lib/phpseclib -prune \) -type f -name "*.php" -exec php -d error_reporting=32767 -l {} \; 2>&1 >&- | grep "^"'
+script:
+  - '! find . -not \( -path ./lib/PEAR -prune \) -not \( -path ./lib/phpseclib -prune \) -not \( -path ./lib/Zend -prune \) -type f -name "*.php" -exec php -d error_reporting=32767 -l {} \; 2>&1 >&- | grep "^"'
   - '! find app/design -type f -name "*.phtml" -exec php -d error_reporting=32767 -l {} \; 2>&1 >&- | grep "^"'
 
-script: exit 0
diff --git a/app/code/core/Mage/Adminhtml/Model/Extension.php b/app/code/core/Mage/Adminhtml/Model/Extension.php
@@ -367,7 +367,6 @@ public function loadLocal($package, $options=array())
         $result = $pear->run('info', $options, array($package));
         if ($result instanceof PEAR_Error) {
             Mage::throwException($result->message);
-            break;
         }
 
         $output = $pear->getOutput();
@@ -386,7 +385,6 @@ public function loadRemote($package, $options=array())
         $result = $pear->run('remote-info', $options, array($package));
         if ($result instanceof PEAR_Error) {
             Mage::throwException($result->message);
-            break;
         }
 
         $output = $pear->getOutput();

diff --git a/lib/3Dsecure/XMLParser.php b/lib/3Dsecure/XMLParser.php
@@ -24,7 +24,7 @@ class XMLParser{
 		// Initialize the XML parser.
 		/////////////////////////////////////////////////////////////////////////////////////////////
 
-		function XMLParser() {
+		function __construct() {
 		  $this->xml_parser = xml_parser_create();
 		}
 

diff --git a/lib/Varien/Pear/Registry.php b/lib/Varien/Pear/Registry.php
@@ -46,7 +46,7 @@ function _initializeDepDB()
                     } else {
                         $file = '.pearrc';
                     }
-                    $this->_config = &new PEAR_Config($this->statedir . DIRECTORY_SEPARATOR .
+                    $this->_config = new PEAR_Config($this->statedir . DIRECTORY_SEPARATOR .
                         $file, '-'); // NO SYSTEM INI FILE
                     $this->_config->setRegistry($this);
                     $this->_config->set('php_dir', $this->install_dir);