Permalink
Browse files

Switched to new composer autoload

  • Loading branch information...
1 parent 2c9c55d commit e4d0db675dd7995e34d439cc2a0713d4cd35d57a @phiamo committed May 19, 2012
Showing with 50 additions and 52 deletions.
  1. +2 −11 app/autoload.php
  2. +48 −41 app/bootstrap.php.cache
View
@@ -1,17 +1,8 @@
<?php
-if (!$loader = include __DIR__.'/../vendor/.composer/autoload.php') {
+if (!$loader = include __DIR__.'/../vendor/autoload.php') {
$nl = PHP_SAPI === 'cli' ? PHP_EOL : '<br />';
echo "$nl$nl";
- if (is_writable(dirname(__DIR__)) && $installer = @file_get_contents('http://getcomposer.org/installer')) {
- echo 'You must set up the project dependencies.'.$nl;
- $installerPath = dirname(__DIR__).'/install-composer.php';
- file_put_contents($installerPath, $installer);
- echo 'The composer installer has been downloaded in '.$installerPath.$nl;
- die('Run the following commands in '.dirname(__DIR__).':'.$nl.$nl.
- 'php install-composer.php'.$nl.
- 'php composer.phar install'.$nl);
- }
die('You must set up the project dependencies.'.$nl.
'Run the following commands in '.dirname(__DIR__).':'.$nl.$nl.
'curl -s http://getcomposer.org/installer | php'.$nl.
@@ -32,4 +23,4 @@
// Swiftmailer needs a special autoloader to allow
// the lazy loading of the init file (which is expensive)
require_once __DIR__.'/../vendor/swiftmailer/swiftmailer/lib/classes/Swift.php';
-Swift::registerAutoload(__DIR__.'/../vendor/swiftmailer/swiftmailer/lib/swift_init.php');
+Swift::registerAutoload(__DIR__.'/../vendor/swiftmailer/swiftmailer/lib/swift_init.php');
View
@@ -467,7 +467,12 @@ abstract class Kernel implements KernelInterface, TerminableInterface
protected $classes;
protected $errorReportingLevel;
- const VERSION = '2.1.0-DEV';
+ const VERSION = '2.1.0-DEV';
+ const VERSION_ID = '20100';
+ const MAJOR_VERSION = '2';
+ const MINOR_VERSION = '1';
+ const RELEASE_VERSION = '0';
+ const EXTRA_VERSION = 'DEV';
public function __construct($environment, $debug)
@@ -1103,7 +1108,7 @@ class ClassCollectionLoader
{
$tmpFile = tempnam(dirname($file), basename($file));
if (false !== @file_put_contents($tmpFile, $content) && @rename($tmpFile, $file)) {
- chmod($file, 0666 & ~umask());
+ @chmod($file, 0666 & ~umask());
return;
}
@@ -1318,6 +1323,45 @@ class UniversalClassLoader
namespace Symfony\Component\HttpKernel\Bundle
{
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
+
+
+interface BundleInterface extends ContainerAwareInterface
+{
+
+ function boot();
+
+
+ function shutdown();
+
+
+ function build(ContainerBuilder $container);
+
+
+ function getContainerExtension();
+
+
+ function getParent();
+
+
+ function getName();
+
+
+ function getNamespace();
+
+
+ function getPath();
+}
+}
+
+
+
+
+namespace Symfony\Component\HttpKernel\Bundle
+{
+
use Symfony\Component\DependencyInjection\ContainerAware;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Container;
@@ -1444,43 +1488,6 @@ abstract class Bundle extends ContainerAware implements BundleInterface
-namespace Symfony\Component\HttpKernel\Bundle
-{
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-
-interface BundleInterface
-{
-
- function boot();
-
-
- function shutdown();
-
-
- function build(ContainerBuilder $container);
-
-
- function getContainerExtension();
-
-
- function getParent();
-
-
- function getName();
-
-
- function getNamespace();
-
-
- function getPath();
-}
-}
-
-
-
-
namespace Symfony\Component\Config
{
@@ -1544,7 +1551,7 @@ class ConfigCache
$tmpFile = tempnam(dirname($this->file), basename($this->file));
if (false !== @file_put_contents($tmpFile, $content) && @rename($tmpFile, $this->file)) {
- chmod($this->file, 0666 & ~umask());
+ @chmod($this->file, 0666 & ~umask());
} else {
throw new \RuntimeException(sprintf('Failed to write cache file "%s".', $this->file));
}
@@ -1553,7 +1560,7 @@ class ConfigCache
$file = $this->file.'.meta';
$tmpFile = tempnam(dirname($file), basename($file));
if (false !== @file_put_contents($tmpFile, serialize($metadata)) && @rename($tmpFile, $file)) {
- chmod($file, 0666 & ~umask());
+ @chmod($file, 0666 & ~umask());
}
}
}

0 comments on commit e4d0db6

Please sign in to comment.