Browse Source

Fixed composer about yii2-dev installation

tags/2.0.0-beta
Qiang Xue 11 years ago
parent
commit
c04e650799
  1. 14
      extensions/yii/composer/Installer.php

14
extensions/yii/composer/Installer.php

@ -44,7 +44,7 @@ class Installer extends LibraryInstaller
$this->addPackage($package); $this->addPackage($package);
// ensure the yii2-dev package also provides Yii.php in the same place as yii2 does // ensure the yii2-dev package also provides Yii.php in the same place as yii2 does
if ($package->getName() == 'yiisoft/yii2-dev') { if ($package->getName() == 'yiisoft/yii2-dev') {
$this->linkYiiBaseFiles(); $this->linkBaseYiiFiles();
} }
} }
@ -58,7 +58,7 @@ class Installer extends LibraryInstaller
$this->addPackage($target); $this->addPackage($target);
// ensure the yii2-dev package also provides Yii.php in the same place as yii2 does // ensure the yii2-dev package also provides Yii.php in the same place as yii2 does
if ($initial->getName() == 'yiisoft/yii2-dev') { if ($initial->getName() == 'yiisoft/yii2-dev') {
$this->linkYiiBaseFiles(); $this->linkBaseYiiFiles();
} }
} }
@ -73,7 +73,7 @@ class Installer extends LibraryInstaller
$this->removePackage($package); $this->removePackage($package);
// remove links for Yii.php // remove links for Yii.php
if ($package->getName() == 'yiisoft/yii2-dev') { if ($package->getName() == 'yiisoft/yii2-dev') {
$this->removeYiiBaseFiles(); $this->removeBaseYiiFiles();
} }
} }
@ -169,13 +169,13 @@ class Installer extends LibraryInstaller
} }
} }
protected function linkYiiBaseFiles() protected function linkBaseYiiFiles()
{ {
$yiiDir = $this->vendorDir . '/yiisoft/yii2/yii'; $yiiDir = $this->vendorDir . '/yiisoft/yii2/yii';
if (!file_exists($yiiDir)) { if (!file_exists($yiiDir)) {
mkdir($yiiDir, 0777, true); mkdir($yiiDir, 0777, true);
} }
foreach(['Yii.php', 'YiiBase.php', 'classes.php'] as $file) { foreach(['Yii.php', 'BaseYii.php', 'classes.php'] as $file) {
file_put_contents($yiiDir . '/' . $file, <<<EOF file_put_contents($yiiDir . '/' . $file, <<<EOF
<?php <?php
/** /**
@ -193,10 +193,10 @@ EOF
} }
} }
protected function removeYiiBaseFiles() protected function removeBaseYiiFiles()
{ {
$yiiDir = $this->vendorDir . '/yiisoft/yii2/yii'; $yiiDir = $this->vendorDir . '/yiisoft/yii2/yii';
foreach(['Yii.php', 'YiiBase.php', 'classes.php'] as $file) { foreach(['Yii.php', 'BaseYii.php', 'classes.php'] as $file) {
if (file_exists($yiiDir . '/' . $file)) { if (file_exists($yiiDir . '/' . $file)) {
unlink($yiiDir . '/' . $file); unlink($yiiDir . '/' . $file);
} }

Loading…
Cancel
Save