Commit 17fe37a7 authored by Fabien Potencier's avatar Fabien Potencier

merged branch stof/composer_update (PR #309)

Commits
-------

49212fcb Updated the compiler for the new Composer file location

Discussion
----------

Updated the compiler for the new Composer file location

This updates the phar for the new location of composer files since composer/composer#603

Old files are created by composer for BC reason but it would not help here as they need the new ones which would not be included in the phar before my change. I haven't included the BC files in the phar as they are not needed (users will not access them directly anyway)
parents c3fd3464 49212fcb
#!/usr/bin/env php #!/usr/bin/env php
<?php <?php
require_once __DIR__.'/vendor/.composer/autoload.php'; require_once __DIR__.'/vendor/autoload.php';
use Silex\Compiler; use Silex\Compiler;
......
...@@ -69,10 +69,10 @@ class Compiler ...@@ -69,10 +69,10 @@ class Compiler
} }
$this->addFile($phar, new \SplFileInfo(__DIR__.'/../../LICENSE'), false); $this->addFile($phar, new \SplFileInfo(__DIR__.'/../../LICENSE'), false);
$this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/.composer/autoload.php')); $this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/autoload.php'));
$this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/.composer/ClassLoader.php')); $this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/ClassLoader.php'));
$this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/.composer/autoload_namespaces.php')); $this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/autoload_namespaces.php'));
$this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/.composer/autoload_classmap.php')); $this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/autoload_classmap.php'));
// Stubs // Stubs
$phar->setStub($this->getStub()); $phar->setStub($this->getStub());
...@@ -112,7 +112,7 @@ class Compiler ...@@ -112,7 +112,7 @@ class Compiler
Phar::mapPhar('silex.phar'); Phar::mapPhar('silex.phar');
require_once 'phar://silex.phar/vendor/.composer/autoload.php'; require_once 'phar://silex.phar/vendor/autoload.php';
if ('cli' === php_sapi_name() && basename(__FILE__) === basename($_SERVER['argv'][0]) && isset($_SERVER['argv'][1])) { if ('cli' === php_sapi_name() && basename(__FILE__) === basename($_SERVER['argv'][0]) && isset($_SERVER['argv'][1])) {
switch ($_SERVER['argv'][1]) { switch ($_SERVER['argv'][1]) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment