Merge pull request #222 from mlocati/fix-ide-warnings

Fix ide warnings

Author: mlocati

src/Base/Abstracts/Package.php

@@ -45,7 +45,7 @@ class Package extends CompletePackage
     public function getSimpleName()
     {
         $full_name = $this->getName();
-
+        $m = null;
         if (!preg_match(',(.+)/(.+),', $full_name, $m)) {
             return $full_name;
         }
@@ -56,7 +56,7 @@ public function getSimpleName()
     public function getVendorName()
     {
         $full_name = $this->getName();
-
+        $m = null;
         if (!preg_match(',(.+)/(.+),', $full_name, $m)) {
             return;
         }

src/Console/Helper/PackageHelper.php

@@ -99,7 +99,7 @@ public function showOptions(OutputInterface $output, Interfaces\Package $package
     /**
      * @param $path
      *
-     * @return Pickle\Base\Interfaces\Package
+     * @return \Pickle\Base\Interfaces\Package
      */
     public function convey(InputInterface $input, OutputInterface $output, $path, $target = null)
     {

src/Engine/PHP.php

@@ -270,6 +270,7 @@ private function getFromConstants()
 
         $cmd = $this->phpCliEscaped . ' -r ' . '"' . str_replace("\n", '', $script) . '"';
 
+        $info = null;
         exec($cmd, $info);
         if (count($info) !== 7) {
             throw new Exception('Could not determine info from the PHP binary');
@@ -286,6 +287,7 @@ private function getFromConstants()
     private function getFromPhpInfo()
     {
         $cmd = $this->phpCliEscaped . ' -i';
+        $info = null;
         exec($cmd, $info);
 
         if (!is_array($info)) {

src/Package/Convey/Command/Git.php

@@ -61,6 +61,7 @@ public function getType()
 
     protected function prepare()
     {
+        $matches = null;
         if (Type::determineGit($this->path, $matches) < 1) {
             throw new Exception('Not valid git URI');
         }

src/Package/Convey/Command/Pickle.php

@@ -70,6 +70,7 @@ protected function fetchPackageJson()
     {
         $extensionJson = @file_get_contents('http://localhost:8080/json/' . $this->name . '.json');
         if (!$extensionJson) {
+            /** @var array $http_response_header */
             $status = $http_response_header[0] ?? '';
             if (strpos($status, '404') !== false) {
                 throw new Exception("cannot find {$this->name}");
@@ -85,6 +86,7 @@ protected function fetchPackageJson()
 
     protected function prepare()
     {
+        $matches = null;
         if (Type::determinePickle($this->path, $matches) < 1) {
             throw new Exception('Not a pickle git URI');
         }
@@ -105,7 +107,7 @@ protected function prepare()
             $versionConstraints = $versionParser->parseConstraints($matches['version']);
 
             /* versions are sorted decreasing */
-            foreach ($extension['packages'][$this->name] as $version => $release) {
+            foreach (array_keys($extension['packages'][$this->name]) as $version) {
                 $constraint = new VersionConstraint('=', $versionParser->normalize($version));
                 if ($versionConstraints->matches($constraint)) {
                     $versionToUse = $version;

src/Package/Convey/Command/Type.php

@@ -120,6 +120,7 @@ public static function determine($path, $remote)
         if (substr($path, -4) == '.tgz' || substr($path, -7) == '.tar.gz') {
             return self::TGZ;
         }
+        $matches = null;
         if ($remote && self::determinePecl($path, $matches) > 0) {
             return self::PECL;
         }

src/Package/PHP/Command/Build/Windows.php

@@ -134,7 +134,7 @@ public function getInfo()
         $info = [];
         $info = array_merge($info, $this->getInfoFromPhpizeLog());
         $info = array_merge($info, $this->getInfoFromConfigureLog());
-
+        $m = null;
         if (!preg_match(',(.+)/(.+),', $info['name'], $m)) {
             $info['vendor'] = null;
         } else {
@@ -178,6 +178,7 @@ protected function getInfoFromPhpizeLog()
         ];
 
         $tmp = $this->getLog('phpize');
+        $m = null;
         if (!preg_match(",Rebuilding configure.js[\n\r\\d:]+\\s+(.+)[\n\r]+,", $tmp, $m)) {
             throw new Exception("Couldn't determine PHP development SDK path");
         }
@@ -211,13 +212,15 @@ protected function getInfoFromConfigureLog()
             'arch' => null,
             'version' => null,
             'name' => null,
+            'is_release' => null,
         ];
 
         $tmp = $this->getLog('configure');
-
+        $m = null;
         if (!preg_match(',Build type\\s+\\|\\s+([a-zA-Z]+),', $tmp, $m)) {
             throw new Exception("Couldn't determine the build thread safety");
         }
+        $info['is_release'] = $m[1] === 'Release';
 
         if (!preg_match(',Thread Safety\\s+\\|\\s+([a-zA-Z]+),', $tmp, $m)) {
             throw new Exception("Couldn't determine the build thread safety");

src/Package/PHP/Command/Install/Windows/Binary.php

@@ -251,7 +251,9 @@ private function download($url)
                 },
             ]
         );
-        $output->writeln("downloading {$url} ");
+        if ($this->output) {
+            $this->output->writeln("downloading {$url} ");
+        }
         $fileContents = file_get_contents($url, false, $ctx);
         $progress->finish();
         if (!$fileContents) {
@@ -325,7 +327,7 @@ private function getInfoFromPecl()
         if ($headerPkg === null) {
             throw new Exception('Cannot find extension <' . $this->extName . '>');
         }
-
+        $m = null;
         if (!preg_match('|=(.*)\\.[a-z0-9]{2,3}$|', $headerPkg, $m)) {
             throw new Exception('Invalid response from pecl.php.net');
         }

src/Package/PHP/Command/Release.php

@@ -41,7 +41,6 @@
 use Phar;
 use PharData;
 use Pickle\Base\Interfaces;
-use Pickle\Package;
 use Pickle\Package\PHP\Util\PackageJson;
 use Pickle\Package\Util\Header;
 

src/Package/PHP/Command/Release/Windows/Binary.php

@@ -36,10 +36,10 @@
 
 namespace Pickle\Package\PHP\Command\Release\Windows;
 
+use Closure;
 use Exception;
 use Pickle\Base\Archive;
 use Pickle\Base\Interfaces;
-use Pickle\Package;
 use Pickle\Package\PHP\Util\PackageJson;
 use Pickle\Package\Util\Header;
 
@@ -99,6 +99,7 @@ public function create(array $args = [])
         $tmp_dir = $build->getTempDir();
 
         $tmp = $build->getLog('configure');
+        $m = null;
         if (preg_match(',Build dir:\\s+([\\:\\-\\.0-9a-zA-Z\\\\_]+),', $tmp, $m)) {
             if (preg_match(',^[a-z]\\:\\\\,i', $m[1]) && is_dir($m[1])) {
                 /* Parsed the fully qualified path */
@@ -109,7 +110,7 @@ public function create(array $args = [])
             }
         } else {
             $build_dir = $info['arch'] == 'x86' ? $tmp_dir : $tmp_dir . DIRECTORY_SEPARATOR . 'x64';
-            $build_dir .= DIRECTORY_SEPARATOR . ($is_release ? 'Release' : 'Debug');
+            $build_dir .= DIRECTORY_SEPARATOR . (($info['is_release'] ?? true) ? 'Release' : 'Debug');
             $build_dir .= ($info['thread_safe'] ? '_TS' : '');
         }
 
@@ -191,6 +192,7 @@ public function getMultiExtensionNames()
          multiple DLLs be built. */
         $config_w32_path = $this->build->getPackage()->getSourceDir() . DIRECTORY_SEPARATOR . 'config.w32';
         $config_w32 = file_get_contents($config_w32_path);
+        $m = null;
         if (preg_match_all("/EXTENSION\\s*\\(\\s*('|\")([a-z0-9_]+)('|\")\\s*,/Sm", $config_w32, $m, PREG_SET_ORDER)) {
             foreach ($m as $r) {
                 if (!in_array($r[2], $ext_names)) {