Merge remote-tracking branch 'akonosov/MAGETWO-43241' into BUGS

Oleksandr Karpenko · Oleksandr Karpenko · commit 717fa18e275f · 2015-11-03T15:22:58.000+02:00
diff --git a/lib/internal/Magento/Framework/Composer/ComposerInformation.php b/lib/internal/Magento/Framework/Composer/ComposerInformation.php
@@ -252,7 +252,7 @@ private function isMagentoRoot()
     {
         $rootPackage = $this->composer->getPackage();
 
-        return preg_match('/magento\/magento2.e/', $rootPackage->getName());
+        return preg_match('/magento\/magento2...?/', $rootPackage->getName());
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ private function isMagentoRoot()`
`252`	`252`	`{`
`253`	`253`	`$rootPackage = $this->composer->getPackage();`
`254`	`254`
`255`		`- return preg_match('/magento\/magento2.e/', $rootPackage->getName());`
	`255`	`+ return preg_match('/magento\/magento2...?/', $rootPackage->getName());`
`256`	`256`	`}`
`257`	`257`
`258`	`258`	`/**`