Merge pull request #245 from niksamokhvalov/bitrix_bugfix

Bitrix bugfix
composer · Jun 13, 2015 · e420b53 · e420b53
2 parents 9e5aafc + c3604cb
commit e420b53
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/Composer/Installers/BitrixInstaller.php b/src/Composer/Installers/BitrixInstaller.php
@@ -17,7 +17,10 @@ class BitrixInstaller extends BaseInstaller
         'theme'     => 'bitrix/templates/{$name}/',
     );
 
-    protected static $isInstall = 1;
+    /**
+     * @var array Storage for informations about duplicates at all the time of installation packages
+     */
+    private static $checkedDuplicates = [];
 
     /**
      * {@inheritdoc}
@@ -38,12 +41,6 @@ protected function templatePath($path, array $vars = array())
      */
     protected function checkDuplicates($templatePath, array $vars = array())
     {
-        if (static::$isInstall === 0) {
-            return;
-        }
-
-        static::$isInstall--;
-
         /**
          * Incorrect paths for backward compatibility
          */
@@ -56,6 +53,10 @@ protected function checkDuplicates($templatePath, array $vars = array())
         $packageType = substr($vars['type'], strlen('bitrix') + 1);
         $oldLocation = str_replace('{$name}', $vars['name'], $oldLocations[$packageType]);
 
+        if (in_array($oldLocation, static::$checkedDuplicates)) {
+            return;
+        }
+
         if ($oldLocation !== $templatePath && file_exists($oldLocation) && $this->io && $this->io->isInteractive()) {
 
             $this->io->writeError('    <error>Duplication of packages:</error>');
@@ -82,5 +83,7 @@ protected function checkDuplicates($templatePath, array $vars = array())
                 }
             }
         }
+
+        static::$checkedDuplicates[] = $oldLocation;
     }
 }