The SSH host key has changed on 8 April, 2022 to this one: SHA256:573uTBSeh74kvOo0HJXi5ijdzRm8me27suzNEDlGyrQ

Updated to Symfony 2.1 BETA3

master
Polonkai Gergely 11 years ago
parent 7a06301624
commit 9d0d2ce524
  1. 16
      app/SymfonyRequirements.php
  2. 146
      app/bootstrap.php.cache
  3. 3
      composer.json
  4. 59
      composer.lock
  5. BIN
      composer.phar
  6. 1
      vendor/composer/autoload_namespaces.php
  7. 548
      vendor/composer/installed.json
  8. 1
      vendor/egeloen/ckeditor-bundle/Ivory/CKEditorBundle
  9. 14
      vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Composer/ScriptHandler.php
  10. 91
      vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Diff/Diff.php
  11. 16
      vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Resources/skeleton/app/SymfonyRequirements.php
  12. 59
      vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Upgrader/Upgrader.php
  13. 4
      vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/.gitignore
  14. 6
      vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/CHANGELOG-2.1.md
  15. 13
      vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Resources/doc/annotations/converters.rst
  16. 18
      vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/Configuration/ConfigurationAnnotationTest.php
  17. 101
      vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/EventListener/CacheListenerTest.php
  18. 85
      vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/EventListener/ControllerListenerTest.php
  19. 17
      vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/EventListener/Fixture/FooControllerCacheAtClass.php
  20. 25
      vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/EventListener/Fixture/FooControllerCacheAtClassAndMethod.php
  21. 17
      vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/EventListener/Fixture/FooControllerCacheAtMethod.php
  22. 87
      vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/Request/ParamConverter/DoctrineParamConverterTest.php
  23. 99
      vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/Request/ParamConverter/ParamConverterManagerTest.php
  24. 20
      vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/phpunit.xml.dist
  25. 3
      vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/.gitignore
  26. 2
      vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Command/GenerateBundleCommand.php
  27. 101
      vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Tests/Command/GenerateBundleCommandTest.php
  28. 74
      vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Tests/Command/GenerateCommandTest.php
  29. 141
      vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Tests/Command/GenerateDoctrineCrudCommandTest.php
  30. 104
      vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Tests/Command/GenerateDoctrineEntityCommandTest.php
  31. 59
      vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Tests/Generator/BundleGeneratorTest.php
  32. 206
      vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Tests/Generator/DoctrineCrudGeneratorTest.php
  33. 40
      vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Tests/Generator/DoctrineFormGeneratorTest.php
  34. 32
      vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Tests/Generator/GeneratorTest.php
  35. 20
      vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/phpunit.xml.dist
  36. 6
      vendor/swiftmailer/swiftmailer/.gitignore
  37. 100
      vendor/swiftmailer/swiftmailer/CHANGES
  38. 16
      vendor/swiftmailer/swiftmailer/README
  39. 67
      vendor/swiftmailer/swiftmailer/README.git
  40. 2
      vendor/swiftmailer/swiftmailer/VERSION
  41. 112
      vendor/swiftmailer/swiftmailer/build.xml
  42. 42
      vendor/swiftmailer/swiftmailer/create_pear_package.php
  43. 4
      vendor/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php
  44. 8
      vendor/swiftmailer/swiftmailer/lib/swift_required.php
  45. 8
      vendor/swiftmailer/swiftmailer/lib/swift_required_pear.php
  46. 15
      vendor/swiftmailer/swiftmailer/notes/APPS
  47. 46
      vendor/swiftmailer/swiftmailer/notes/CHARSETS
  48. 22
      vendor/swiftmailer/swiftmailer/notes/message.xml
  49. 4050
      vendor/swiftmailer/swiftmailer/notes/rfc/rfc0821.txt
  50. 2901
      vendor/swiftmailer/swiftmailer/notes/rfc/rfc0822.txt
  51. 5265
      vendor/swiftmailer/swiftmailer/notes/rfc/rfc1341.txt
  52. 4539
      vendor/swiftmailer/swiftmailer/notes/rfc/rfc1521.txt
  53. 395
      vendor/swiftmailer/swiftmailer/notes/rfc/rfc1854.txt
  54. 1739
      vendor/swiftmailer/swiftmailer/notes/rfc/rfc2045.txt
  55. 2467
      vendor/swiftmailer/swiftmailer/notes/rfc/rfc2046.txt
  56. 843
      vendor/swiftmailer/swiftmailer/notes/rfc/rfc2047.txt
  57. 1180
      vendor/swiftmailer/swiftmailer/notes/rfc/rfc2048.txt
  58. 1347
      vendor/swiftmailer/swiftmailer/notes/rfc/rfc2049.txt
  59. 675
      vendor/swiftmailer/swiftmailer/notes/rfc/rfc2183.txt
  60. 899
      vendor/swiftmailer/swiftmailer/notes/rfc/rfc2222.txt
  61. 563
      vendor/swiftmailer/swiftmailer/notes/rfc/rfc2231.txt
  62. 787
      vendor/swiftmailer/swiftmailer/notes/rfc/rfc2234.txt
  63. 451
      vendor/swiftmailer/swiftmailer/notes/rfc/rfc2487.txt
  64. 619
      vendor/swiftmailer/swiftmailer/notes/rfc/rfc2554.txt
  65. 4427
      vendor/swiftmailer/swiftmailer/notes/rfc/rfc2821.txt
  66. 2859
      vendor/swiftmailer/swiftmailer/notes/rfc/rfc2822.txt
  67. 1123
      vendor/swiftmailer/swiftmailer/notes/rfc/rfc3676.txt
  68. 507
      vendor/swiftmailer/swiftmailer/notes/rfc/rfc4505.txt
  69. 619
      vendor/swiftmailer/swiftmailer/notes/rfc/rfc4616.txt
  70. 1123
      vendor/swiftmailer/swiftmailer/notes/rfc/rfc4954.txt
  71. 61
      vendor/swiftmailer/swiftmailer/notes/rfc/whats_where.txt
  72. 48
      vendor/swiftmailer/swiftmailer/notes/smtp.txt
  73. 73
      vendor/swiftmailer/swiftmailer/package.xml.tpl
  74. 7
      vendor/swiftmailer/swiftmailer/test-suite/CHANGES
  75. 165
      vendor/swiftmailer/swiftmailer/test-suite/LICENSE
  76. 159
      vendor/swiftmailer/swiftmailer/test-suite/README
  77. 68
      vendor/swiftmailer/swiftmailer/test-suite/config.php
  78. 40
      vendor/swiftmailer/swiftmailer/test-suite/index.php
  79. 69
      vendor/swiftmailer/swiftmailer/test-suite/lib/Sweety/Reporter.php
  80. 203
      vendor/swiftmailer/swiftmailer/test-suite/lib/Sweety/Reporter/CliReporter.php
  81. 160
      vendor/swiftmailer/swiftmailer/test-suite/lib/Sweety/Reporter/CliTestCaseReporter.php
  82. 174
      vendor/swiftmailer/swiftmailer/test-suite/lib/Sweety/Reporter/HtmlReporter.php
  83. 174
      vendor/swiftmailer/swiftmailer/test-suite/lib/Sweety/Reporter/HtmlTestCaseReporter.php
  84. 56
      vendor/swiftmailer/swiftmailer/test-suite/lib/Sweety/Runner.php
  85. 365
      vendor/swiftmailer/swiftmailer/test-suite/lib/Sweety/Runner/AbstractTestRunner.php
  86. 128
      vendor/swiftmailer/swiftmailer/test-suite/lib/Sweety/Runner/CliRunner.php
  87. 160
      vendor/swiftmailer/swiftmailer/test-suite/lib/Sweety/Runner/HtmlRunner.php
  88. 25
      vendor/swiftmailer/swiftmailer/test-suite/lib/Sweety/TestLocator.php
  89. 71
      vendor/swiftmailer/swiftmailer/test-suite/lib/Sweety/TestLocator/PearStyleLocator.php
  90. 383
      vendor/swiftmailer/swiftmailer/test-suite/lib/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE
  91. 502
      vendor/swiftmailer/swiftmailer/test-suite/lib/simpletest/LICENSE
  92. 108
      vendor/swiftmailer/swiftmailer/test-suite/lib/simpletest/README
  93. 176
      vendor/swiftmailer/swiftmailer/test-suite/lib/simpletest/TODO.xml
  94. 1
      vendor/swiftmailer/swiftmailer/test-suite/lib/simpletest/VERSION
  95. 237
      vendor/swiftmailer/swiftmailer/test-suite/lib/simpletest/authentication.php
  96. 97
      vendor/swiftmailer/swiftmailer/test-suite/lib/simpletest/autorun.php
  97. 1094
      vendor/swiftmailer/swiftmailer/test-suite/lib/simpletest/browser.php
  98. 122
      vendor/swiftmailer/swiftmailer/test-suite/lib/simpletest/collector.php
  99. 166
      vendor/swiftmailer/swiftmailer/test-suite/lib/simpletest/compatibility.php
  100. 380
      vendor/swiftmailer/swiftmailer/test-suite/lib/simpletest/cookies.php
  101. Some files were not shown because too many files have changed in this diff Show More

@ -429,11 +429,11 @@ class SymfonyRequirements extends RequirementCollection
);
if (version_compare($installedPhpVersion, self::REQUIRED_PHP_VERSION, '>=')) {
$this->addRequirement(
(in_array(date_default_timezone_get(), DateTimeZone::listIdentifiers())),
sprintf('Default timezone is deprecated (%s)', date_default_timezone_get()),
'Fix your <strong>php.ini</strong> file (list of deprecated timezones http://us.php.net/manual/en/timezones.others.php).'
);
$this->addRequirement(
(in_array(date_default_timezone_get(), DateTimeZone::listIdentifiers())),
sprintf('Default timezone "%s" is not supported by your installation of PHP', date_default_timezone_get()),
'Fix your <strong>php.ini</strong> file (check for typos and have a look at the list of deprecated timezones http://php.net/manual/en/timezones.others.php).'
);
}
$this->addRequirement(
@ -492,6 +492,12 @@ class SymfonyRequirements extends RequirementCollection
/* optional recommendations follow */
$this->addRecommendation(
version_compare($installedPhpVersion, '5.3.4', '>='),
sprintf('Your project might not work properly ("Notice: Trying to get property of non-object") due to the PHP bug #52083 before PHP 5.3.4 (%s installed)', $installedPhpVersion),
'Install PHP 5.3.4 or newer'
);
$this->addRecommendation(
version_compare($installedPhpVersion, '5.3.8', '>='),
sprintf('Annotations might not work properly due to the PHP bug #55156 before PHP 5.3.8 (%s installed)', $installedPhpVersion),

@ -13,7 +13,7 @@ namespace Symfony\Component\DependencyInjection
interface ContainerAwareInterface
{
function setContainer(ContainerInterface $container = null);
public function setContainer(ContainerInterface $container = null);
}
}
@ -35,37 +35,37 @@ interface ContainerInterface
const SCOPE_PROTOTYPE = 'prototype';
function set($id, $service, $scope = self::SCOPE_CONTAINER);
public function set($id, $service, $scope = self::SCOPE_CONTAINER);
function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE);
public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE);
function has($id);
public function has($id);
function getParameter($name);
public function getParameter($name);
function hasParameter($name);
public function hasParameter($name);
function setParameter($name, $value);
public function setParameter($name, $value);
function enterScope($name);
public function enterScope($name);
function leaveScope($name);
public function leaveScope($name);
function addScope(ScopeInterface $scope);
public function addScope(ScopeInterface $scope);
function hasScope($name);
public function hasScope($name);
function isScopeActive($name);
public function isScopeActive($name);
}
}
@ -79,7 +79,7 @@ namespace Symfony\Component\DependencyInjection
interface IntrospectableContainerInterface extends ContainerInterface
{
function initialized($id);
public function initialized($id);
}
}
@ -340,13 +340,13 @@ class Container implements IntrospectableContainerInterface
}
static public function camelize($id)
public static function camelize($id)
{
return preg_replace_callback('/(^|_|\.)+(.)/', function ($match) { return ('.' === $match[1] ? '_' : '').strtoupper($match[2]); }, $id);
}
static public function underscore($id)
public static function underscore($id)
{
return strtolower(preg_replace(array('/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'), array('\\1_\\2', '\\1_\\2'), strtr($id, '_', '.')));
}
@ -356,23 +356,6 @@ class Container implements IntrospectableContainerInterface
namespace Symfony\Component\HttpKernel
{
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
interface TerminableInterface
{
function terminate(Request $request, Response $response);
}
}
namespace Symfony\Component\HttpKernel
{
@ -386,7 +369,7 @@ interface HttpKernelInterface
const SUB_REQUEST = 2;
function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true);
public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true);
}
}
@ -405,55 +388,72 @@ use Symfony\Component\Config\Loader\LoaderInterface;
interface KernelInterface extends HttpKernelInterface, \Serializable
{
function registerBundles();
public function registerBundles();
function registerContainerConfiguration(LoaderInterface $loader);
public function registerContainerConfiguration(LoaderInterface $loader);
function boot();
public function boot();
function shutdown();
public function shutdown();
function getBundles();
public function getBundles();
function isClassInActiveBundle($class);
public function isClassInActiveBundle($class);
function getBundle($name, $first = true);
public function getBundle($name, $first = true);
function locateResource($name, $dir = null, $first = true);
public function locateResource($name, $dir = null, $first = true);
function getName();
public function getName();
function getEnvironment();
public function getEnvironment();
function isDebug();
public function isDebug();
function getRootDir();
public function getRootDir();
function getContainer();
public function getContainer();
function getStartTime();
public function getStartTime();
function getCacheDir();
public function getCacheDir();
function getLogDir();
public function getLogDir();
function getCharset();
public function getCharset();
}
}
namespace Symfony\Component\HttpKernel
{
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
interface TerminableInterface
{
public function terminate(Request $request, Response $response);
}
}
@ -502,12 +502,12 @@ abstract class Kernel implements KernelInterface, TerminableInterface
protected $classes;
protected $errorReportingLevel;
const VERSION = '2.1.0-BETA2';
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 = 'BETA';
const EXTRA_VERSION = 'DEV';
public function __construct($environment, $debug)
@ -516,7 +516,7 @@ abstract class Kernel implements KernelInterface, TerminableInterface
$this->debug = (Boolean) $debug;
$this->booted = false;
$this->rootDir = $this->getRootDir();
$this->name = preg_replace('/[^a-zA-Z0-9_]+/', '', basename($this->rootDir));
$this->name = $this->getName();
$this->classes = array();
if ($this->debug) {
@ -706,6 +706,10 @@ abstract class Kernel implements KernelInterface, TerminableInterface
public function getName()
{
if (null === $this->name) {
$this->name = preg_replace('/[^a-zA-Z0-9_]+/', '', basename($this->rootDir));
}
return $this->name;
}
@ -975,7 +979,7 @@ abstract class Kernel implements KernelInterface, TerminableInterface
}
static public function stripComments($source)
public static function stripComments($source)
{
if (!function_exists('token_get_all')) {
return $source;
@ -1084,28 +1088,28 @@ use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
interface BundleInterface extends ContainerAwareInterface
{
function boot();
public function boot();
function shutdown();
public function shutdown();
function build(ContainerBuilder $container);
public function build(ContainerBuilder $container);
function getContainerExtension();
public function getContainerExtension();
function getParent();
public function getParent();
function getName();
public function getName();
function getNamespace();
public function getNamespace();
function getPath();
public function getPath();
}
}
@ -1348,6 +1352,7 @@ namespace Symfony\Component\HttpKernel
use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
@ -1450,14 +1455,27 @@ class HttpKernel implements HttpKernelInterface, TerminableInterface
$event = new GetResponseForExceptionEvent($this, $request, $type, $e);
$this->dispatcher->dispatch(KernelEvents::EXCEPTION, $event);
$e = $event->getException();
if (!$event->hasResponse()) {
throw $e;
}
$response = $event->getResponse();
if (!$response->isClientError() && !$response->isServerError() && !$response->isRedirect()) {
if ($e instanceof HttpExceptionInterface) {
$response->setStatusCode($e->getStatusCode());
$response->headers->add($e->getHeaders());
} else {
$response->setStatusCode(500);
}
}
try {
return $this->filterResponse($event->getResponse(), $request, $type);
return $this->filterResponse($response, $request, $type);
} catch (\Exception $e) {
return $event->getResponse();
return $response;
}
}

@ -17,7 +17,8 @@
"sensio/framework-extra-bundle": "dev-master",
"sensio/generator-bundle": "dev-master",
"jms/security-extra-bundle": "1.1.*",
"jms/di-extra-bundle": "1.0.*"
"jms/di-extra-bundle": "1.0.*",
"egeloen/ckeditor-bundle": "2.0.*"
},
"scripts": {
"post-install-cmd": [

59
composer.lock generated

@ -1,5 +1,5 @@
{
"hash": "ab7ccf177098603cace942212179431f",
"hash": "0890891a613a13d9980307e458190353",
"packages": [
{
"package": "doctrine/common",
@ -8,20 +8,23 @@
{
"package": "doctrine/dbal",
"version": "2.2.x-dev",
"source-reference": "b961a3fce6bf220f1dca47d7d747b9074bea4730",
"commit-date": "1341779435"
"source-reference": "b961a3fce6bf220f1dca47d7d747b9074bea4730"
},
{
"package": "doctrine/doctrine-bundle",
"version": "dev-master",
"source-reference": "c9ea46d1f0c48bb88bb87b44214fe44e03c0c692",
"commit-date": "1341405737"
"source-reference": "c9ea46d1f0c48bb88bb87b44214fe44e03c0c692"
},
{
"package": "doctrine/orm",
"version": "2.2.x-dev",
"source-reference": "5d2a3bcb3b467f41ee58575764f3ba84937f76e4",
"commit-date": "1341676080"
"source-reference": "5d2a3bcb3b467f41ee58575764f3ba84937f76e4"
},
{
"package": "egeloen/ckeditor-bundle",
"version": "2.0.x-dev",
"source-reference": "ca9d4a631577d7195c6517dd89ae8a3cc02b85ba",
"commit-date": "1337272707"
},
{
"package": "jms/aop-bundle",
@ -52,8 +55,7 @@
{
"package": "kriswallsmith/assetic",
"version": "dev-master",
"source-reference": "d6f89a3170c5280ad554347dc113eb25fdf00ad7",
"commit-date": "1339515714"
"source-reference": "d6f89a3170c5280ad554347dc113eb25fdf00ad7"
},
{
"package": "monolog/monolog",
@ -62,20 +64,20 @@
{
"package": "sensio/distribution-bundle",
"version": "dev-master",
"source-reference": "9a7dbd867fd5061e4bfd660a175aa66122f53d25",
"commit-date": "1341741741"
"source-reference": "5886adae1613c0a72fbb95259a83ae798e86c0d3",
"commit-date": "1342347850"
},
{
"package": "sensio/framework-extra-bundle",
"version": "dev-master",
"source-reference": "4f54e5d5fb3b54fb107892684018f3704934c48d",
"commit-date": "1341126219"
"source-reference": "e9ac8f1a911ed29e30296c7f1549f53d4c94eddf",
"commit-date": "1342084432"
},
{
"package": "sensio/generator-bundle",
"version": "dev-master",
"source-reference": "43ed45c48db18e4a0e48aec0c098f42e56e22d36",
"commit-date": "1340138445"
"source-reference": "c17dbddefe517e3adfcbeaa1ab7cef3e572d29c6",
"commit-date": "1342195488"
},
{
"package": "swiftmailer/swiftmailer",
@ -86,25 +88,25 @@
{
"package": "swiftmailer/swiftmailer",
"version": "dev-master",
"source-reference": "f51b5f33c83b48faea75f1285f99a2e8f1c66f75",
"commit-date": "1341746460"
"source-reference": "8b2aa953f87da228ba413e8fb1372e49c1374050",
"commit-date": "1342198037"
},
{
"package": "symfony/assetic-bundle",
"version": "dev-master",
"source-reference": "8fe7b898b08103c1d6fce64c3e279a7afd61adfc",
"commit-date": "1340234971"
"source-reference": "ed933dcfa45f00b6bc6d7727007403f3ff429e5a",
"commit-date": "1342126277"
},
{
"package": "symfony/monolog-bundle",
"version": "dev-master",
"source-reference": "7fe7f711bb04b86ad7f45a9e11a7f8cbaf9bc1a5",
"source-reference": "v2.1.0-BETA3",
"commit-date": "1341078487"
},
{
"package": "symfony/swiftmailer-bundle",
"version": "dev-master",
"source-reference": "e1d413ce27fd1696bdc82ad9525f1b874664530e",
"source-reference": "v2.1.0-BETA3",
"commit-date": "1341509614"
},
{
@ -116,14 +118,13 @@
{
"package": "symfony/symfony",
"version": "dev-master",
"source-reference": "v2.1.0-BETA2",
"commit-date": "1341820358"
"source-reference": "151b79a6ce3f459e2fa8815cd9f2786eef750993",
"commit-date": "1342376835"
},
{
"package": "twig/extensions",
"version": "dev-master",
"source-reference": "feb6d3f10c411e2631997c0a905aa581c80305c1",
"commit-date": "1337599699"
"source-reference": "feb6d3f10c411e2631997c0a905aa581c80305c1"
},
{
"package": "twig/twig",
@ -134,13 +135,11 @@
{
"package": "twig/twig",
"version": "dev-master",
"source-reference": "26eb0a2653eade50dffdd31b11ca454232dea8cf",
"commit-date": "1341423205"
"source-reference": "d45664045194ef62573c153c424508527105041e",
"commit-date": "1342424564"
}
],
"packages-dev": [
],
"packages-dev": null,
"aliases": [
],

Binary file not shown.

@ -21,6 +21,7 @@ return array(
'JMS\\SecurityExtraBundle' => $vendorDir . '/jms/security-extra-bundle/',
'JMS\\DiExtraBundle' => $vendorDir . '/jms/di-extra-bundle/',
'JMS\\AopBundle' => $vendorDir . '/jms/aop-bundle/',
'Ivory\\CKEditorBundle' => $vendorDir . '/egeloen/ckeditor-bundle/',
'Doctrine\\ORM' => $vendorDir . '/doctrine/orm/lib/',
'Doctrine\\DBAL' => $vendorDir . '/doctrine/dbal/lib/',
'Doctrine\\Common' => $vendorDir . '/doctrine/common/lib/',

@ -3,7 +3,7 @@
"name": "jms/metadata",
"version": "1.1.1",
"version_normalized": "1.1.1.0",
"time": "2011-12-30 10:32:49",
"time": "2011-12-29 22:32:49",
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/metadata",
@ -47,7 +47,7 @@
"name": "jms/cg",
"version": "1.0.0",
"version_normalized": "1.0.0.0",
"time": "2011-12-30 09:40:52",
"time": "2011-12-29 21:40:52",
"source": {
"type": "git",
"url": "git://github.com/schmittjoh/cg-library.git",
@ -89,7 +89,7 @@
"version": "1.0.0",
"version_normalized": "1.0.0.0",
"target-dir": "JMS/AopBundle",
"time": "2011-12-30 09:50:26",
"time": "2011-12-29 21:50:26",
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/JMSAopBundle",
@ -133,7 +133,7 @@
"version": "1.1.0",
"version_normalized": "1.1.0.0",
"target-dir": "JMS/SecurityExtraBundle",
"time": "2011-12-30 13:38:12",
"time": "2011-12-30 01:38:12",
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/JMSSecurityExtraBundle",
@ -178,7 +178,7 @@
"version": "1.0.1",
"version_normalized": "1.0.1.0",
"target-dir": "JMS/DiExtraBundle",
"time": "2012-02-25 05:01:54",
"time": "2012-02-24 17:01:54",
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/JMSDiExtraBundle",
@ -221,7 +221,7 @@
"name": "doctrine/common",
"version": "2.2.2",
"version_normalized": "2.2.2.0",
"time": "2012-04-08 03:46:44",
"time": "2012-04-07 03:46:44",
"source": {
"type": "git",
"url": "https://github.com/doctrine/common",
@ -287,7 +287,7 @@
"name": "monolog/monolog",
"version": "1.1.0",
"version_normalized": "1.1.0.0",
"time": "2012-04-18 14:27:40",
"time": "2012-04-17 14:27:40",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
@ -337,7 +337,7 @@
"name": "twig/extensions",
"version": "dev-master",
"version_normalized": "9999999-dev",
"time": "2012-05-16 21:28:19",
"time": "2012-05-15 21:28:19",
"source": {
"type": "git",
"url": "https://github.com/fabpot/Twig-extensions",
@ -382,7 +382,7 @@
"name": "kriswallsmith/assetic",
"version": "dev-master",
"version_normalized": "9999999-dev",
"time": "2012-06-08 01:41:54",
"time": "2012-06-07 01:41:54",
"source": {
"type": "git",
"url": "http://github.com/kriswallsmith/assetic.git",
@ -437,21 +437,270 @@
}
}
},
{
"name": "doctrine/doctrine-bundle",
"version": "dev-master",
"version_normalized": "9999999-dev",
"target-dir": "Doctrine/Bundle/DoctrineBundle",
"time": "2012-07-02 10:42:17",
"source": {
"type": "git",
"url": "git://github.com/doctrine/DoctrineBundle.git",
"reference": "c9ea46d1f0c48bb88bb87b44214fe44e03c0c692"
},
"dist": {
"type": "zip",
"url": "https://github.com/doctrine/DoctrineBundle/zipball/c9ea46d1f0c48bb88bb87b44214fe44e03c0c692",
"reference": "c9ea46d1f0c48bb88bb87b44214fe44e03c0c692",
"shasum": ""
},
"require": {
"php": ">=5.3.2",
"doctrine/dbal": ">=2.2,<2.4-dev",
"symfony/framework-bundle": "2.1.*",
"symfony/doctrine-bridge": "2.1.*"
},
"require-dev": {
"doctrine/orm": ">=2.2,<2.4-dev",
"symfony/validator": "2.1.*",
"symfony/yaml": "2.1.*"
},
"suggest": {
"doctrine/orm": "The Doctrine ORM integration is optional in the bundle."
},
"type": "symfony-bundle",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"installation-source": "source",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com",
"homepage": null,
"role": null
},
{
"name": "Symfony Community",
"email": null,
"homepage": "http://symfony.com/contributors",
"role": null
},
{
"name": "Benjamin Eberlei",
"email": "kontakt@beberlei.de",
"homepage": null,
"role": null
}
],
"description": "Symfony DoctrineBundle",
"homepage": "http://www.doctrine-project.org",
"keywords": [
"database",
"orm",
"persistence",
"dbal"
],
"autoload": {
"psr-0": {
"Doctrine\\Bundle\\DoctrineBundle": ""
}
}
},
{
"name": "doctrine/orm",
"version": "2.2.x-dev",
"version_normalized": "2.2.9999999.9999999-dev",
"time": "2012-07-06 07:48:00",
"source": {
"type": "git",
"url": "git://github.com/doctrine/doctrine2.git",
"reference": "5d2a3bcb3b467f41ee58575764f3ba84937f76e4"
},
"dist": {
"type": "zip",
"url": "https://github.com/doctrine/doctrine2/zipball/5d2a3bcb3b467f41ee58575764f3ba84937f76e4",
"reference": "5d2a3bcb3b467f41ee58575764f3ba84937f76e4",
"shasum": ""
},
"require": {
"php": ">=5.3.2",
"ext-pdo": "*",
"doctrine/common": "2.2.*",
"doctrine/dbal": "2.2.*"
},
"type": "library",
"installation-source": "source",
"license": [
"LGPL"
],
"authors": [
{
"name": "Jonathan Wage",
"email": "jonwage@gmail.com",
"homepage": "http://www.jwage.com/",
"role": null
},
{
"name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com",
"homepage": null,
"role": null
},
{
"name": "Roman Borschel",
"email": "roman@code-factory.org",
"homepage": null,
"role": null
},
{
"name": "Benjamin Eberlei",
"email": "kontakt@beberlei.de",
"homepage": null,
"role": null
}
],
"description": "Object-Relational-Mapper for PHP",
"homepage": "http://www.doctrine-project.org",
"keywords": [
"database",
"orm"
],
"autoload": {
"psr-0": {
"Doctrine\\ORM": "lib/"
}
}
},
{
"name": "doctrine/dbal",
"version": "2.2.x-dev",
"version_normalized": "2.2.9999999.9999999-dev",
"time": "2012-07-07 18:30:35",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal",
"reference": "b961a3fce6bf220f1dca47d7d747b9074bea4730"
},
"dist": {
"type": "zip",
"url": "https://github.com/doctrine/dbal/zipball/b961a3fce6bf220f1dca47d7d747b9074bea4730",
"reference": "b961a3fce6bf220f1dca47d7d747b9074bea4730",
"shasum": ""
},
"require": {
"php": ">=5.3.2",
"doctrine/common": ">=2.2.0,<=2.2.99"
},
"type": "library",
"installation-source": "source",
"license": [
"LGPL"
],
"authors": [
{
"name": "Jonathan Wage",
"email": "jonwage@gmail.com",
"homepage": "http://www.jwage.com/",
"role": null
},
{
"name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com",
"homepage": null,
"role": null
},
{
"name": "Roman Borschel",
"email": "roman@code-factory.org",
"homepage": null,
"role": null
},
{
"name": "Benjamin Eberlei",
"email": "kontakt@beberlei.de",
"homepage": null,
"role": null
}
],
"description": "Database Abstraction Layer",
"homepage": "http://www.doctrine-project.org",
"keywords": [
"database",
"persistence",
"dbal",
"queryobject"
],
"autoload": {
"psr-0": {
"Doctrine\\DBAL": "lib/"
}
}
},
{
"name": "egeloen/ckeditor-bundle",
"version": "2.0.x-dev",
"version_normalized": "2.0.9999999.9999999-dev",
"target-dir": "Ivory/CKEditorBundle",
"time": "2012-05-16 18:38:27",
"source": {
"type": "git",
"url": "https://github.com/egeloen/IvoryCKEditorBundle",
"reference": "ca9d4a631577d7195c6517dd89ae8a3cc02b85ba"
},
"dist": {
"type": "zip",
"url": "https://github.com/egeloen/IvoryCKEditorBundle/zipball/ca9d4a631577d7195c6517dd89ae8a3cc02b85ba",
"reference": "ca9d4a631577d7195c6517dd89ae8a3cc02b85ba",
"shasum": ""
},
"require": {
"php": ">=5.3.0",
"symfony/framework-bundle": "2.*"
},
"type": "symfony-bundle",
"installation-source": "source",
"license": [
"MIT"
],
"authors": [
{
"name": "Eric GELOEN",
"email": "geloen.eric@gmail.com",
"homepage": null,
"role": null
}
],
"description": "Provides a CKEditor integration for your Symfony2 Project.",
"keywords": [
"CKEditor"
],
"autoload": {
"psr-0": {
"Ivory\\CKEditorBundle": ""
}
}
},
{
"name": "sensio/generator-bundle",
"version": "dev-master",
"version_normalized": "9999999-dev",
"target-dir": "Sensio/Bundle/GeneratorBundle",
"time": "2012-06-15 18:40:45",
"time": "2012-07-13 00:04:48",
"source": {
"type": "git",
"url": "https://github.com/sensio/SensioGeneratorBundle",
"reference": "43ed45c48db18e4a0e48aec0c098f42e56e22d36"
"reference": "c17dbddefe517e3adfcbeaa1ab7cef3e572d29c6"
},
"dist": {
"type": "zip",
"url": "https://github.com/sensio/SensioGeneratorBundle/zipball/43ed45c48db18e4a0e48aec0c098f42e56e22d36",
"reference": "43ed45c48db18e4a0e48aec0c098f42e56e22d36",
"url": "https://github.com/sensio/SensioGeneratorBundle/zipball/c17dbddefe517e3adfcbeaa1ab7cef3e572d29c6",
"reference": "c17dbddefe517e3adfcbeaa1ab7cef3e572d29c6",
"shasum": ""
},
"require": {
@ -495,16 +744,16 @@
"version": "dev-master",
"version_normalized": "9999999-dev",
"target-dir": "Symfony/Bundle/AsseticBundle",
"time": "2012-06-16 23:29:31",
"time": "2012-07-12 06:51:17",
"source": {
"type": "git",
"url": "https://github.com/symfony/AsseticBundle",
"reference": "8fe7b898b08103c1d6fce64c3e279a7afd61adfc"
"reference": "ed933dcfa45f00b6bc6d7727007403f3ff429e5a"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/AsseticBundle/zipball/8fe7b898b08103c1d6fce64c3e279a7afd61adfc",
"reference": "8fe7b898b08103c1d6fce64c3e279a7afd61adfc",
"url": "https://github.com/symfony/AsseticBundle/zipball/ed933dcfa45f00b6bc6d7727007403f3ff429e5a",
"reference": "ed933dcfa45f00b6bc6d7727007403f3ff429e5a",
"shasum": ""
},
"require": {
@ -551,16 +800,16 @@
"version": "dev-master",
"version_normalized": "9999999-dev",
"target-dir": "Symfony/Bundle/MonologBundle",
"time": "2012-06-28 15:48:07",
"time": "2012-06-30 05:48:07",
"source": {
"type": "git",
"url": "https://github.com/symfony/MonologBundle",
"reference": "7fe7f711bb04b86ad7f45a9e11a7f8cbaf9bc1a5"
"reference": "v2.1.0-BETA3"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/MonologBundle/zipball/7fe7f711bb04b86ad7f45a9e11a7f8cbaf9bc1a5",
"reference": "7fe7f711bb04b86ad7f45a9e11a7f8cbaf9bc1a5",
"url": "https://github.com/symfony/MonologBundle/zipball/v2.1.0-BETA3",
"reference": "v2.1.0-BETA3",
"shasum": ""
},
"require": {
@ -611,16 +860,16 @@
"version": "dev-master",
"version_normalized": "9999999-dev",
"target-dir": "Sensio/Bundle/FrameworkExtraBundle",
"time": "2012-06-29 05:03:39",
"time": "2012-07-11 23:13:52",
"source": {
"type": "git",
"url": "https://github.com/sensio/SensioFrameworkExtraBundle",
"reference": "4f54e5d5fb3b54fb107892684018f3704934c48d"
"reference": "e9ac8f1a911ed29e30296c7f1549f53d4c94eddf"
},
"dist": {
"type": "zip",
"url": "https://github.com/sensio/SensioFrameworkExtraBundle/zipball/4f54e5d5fb3b54fb107892684018f3704934c48d",
"reference": "4f54e5d5fb3b54fb107892684018f3704934c48d",
"url": "https://github.com/sensio/SensioFrameworkExtraBundle/zipball/e9ac8f1a911ed29e30296c7f1549f53d4c94eddf",
"reference": "e9ac8f1a911ed29e30296c7f1549f53d4c94eddf",
"shasum": ""
},
"require": {
@ -660,16 +909,16 @@
"name": "twig/twig",
"version": "dev-master",
"version_normalized": "9999999-dev",
"time": "2012-07-03 15:33:25",
"time": "2012-07-15 23:42:44",
"source": {
"type": "git",
"url": "git://github.com/fabpot/Twig.git",
"reference": "26eb0a2653eade50dffdd31b11ca454232dea8cf"
"reference": "d45664045194ef62573c153c424508527105041e"
},
"dist": {
"type": "zip",
"url": "https://github.com/fabpot/Twig/zipball/26eb0a2653eade50dffdd31b11ca454232dea8cf",
"reference": "26eb0a2653eade50dffdd31b11ca454232dea8cf",
"url": "https://github.com/fabpot/Twig/zipball/d45664045194ef62573c153c424508527105041e",
"reference": "d45664045194ef62573c153c424508527105041e",
"shasum": ""
},
"require": {
@ -710,96 +959,21 @@
}
}
},
{
"name": "doctrine/doctrine-bundle",
"version": "dev-master",
"version_normalized": "9999999-dev",
"target-dir": "Doctrine/Bundle/DoctrineBundle",
"time": "2012-07-03 10:42:17",
"source": {
"type": "git",
"url": "git://github.com/doctrine/DoctrineBundle.git",
"reference": "c9ea46d1f0c48bb88bb87b44214fe44e03c0c692"
},
"dist": {
"type": "zip",
"url": "https://github.com/doctrine/DoctrineBundle/zipball/c9ea46d1f0c48bb88bb87b44214fe44e03c0c692",
"reference": "c9ea46d1f0c48bb88bb87b44214fe44e03c0c692",
"shasum": ""
},
"require": {
"php": ">=5.3.2",
"doctrine/dbal": ">=2.2,<2.4-dev",
"symfony/framework-bundle": "2.1.*",
"symfony/doctrine-bridge": "2.1.*"
},
"require-dev": {
"doctrine/orm": ">=2.2,<2.4-dev",
"symfony/validator": "2.1.*",
"symfony/yaml": "2.1.*"
},
"suggest": {
"doctrine/orm": "The Doctrine ORM integration is optional in the bundle."
},
"type": "symfony-bundle",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"installation-source": "source",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com",
"homepage": null,
"role": null
},
{
"name": "Symfony Community",
"email": null,
"homepage": "http://symfony.com/contributors",
"role": null
},
{
"name": "Benjamin Eberlei",
"email": "kontakt@beberlei.de",
"homepage": null,
"role": null
}
],
"description": "Symfony DoctrineBundle",
"homepage": "http://www.doctrine-project.org",
"keywords": [
"database",
"orm",
"persistence",
"dbal"
],
"autoload": {
"psr-0": {
"Doctrine\\Bundle\\DoctrineBundle": ""
}
}
},
{
"name": "symfony/swiftmailer-bundle",
"version": "dev-master",
"version_normalized": "9999999-dev",
"target-dir": "Symfony/Bundle/SwiftmailerBundle",
"time": "2012-07-04 15:33:34",
"time": "2012-07-05 11:33:34",
"source": {
"type": "git",
"url": "https://github.com/symfony/SwiftmailerBundle",
"reference": "e1d413ce27fd1696bdc82ad9525f1b874664530e"
"reference": "v2.1.0-BETA3"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/SwiftmailerBundle/zipball/e1d413ce27fd1696bdc82ad9525f1b874664530e",
"reference": "e1d413ce27fd1696bdc82ad9525f1b874664530e",
"url": "https://github.com/symfony/SwiftmailerBundle/zipball/v2.1.0-BETA3",
"reference": "v2.1.0-BETA3",
"shasum": ""
},
"require": {
@ -844,85 +1018,20 @@
}
}
},
{
"name": "doctrine/orm",
"version": "2.2.x-dev",
"version_normalized": "2.2.9999999.9999999-dev",
"time": "2012-07-07 07:48:00",
"source": {
"type": "git",
"url": "git://github.com/doctrine/doctrine2.git",
"reference": "5d2a3bcb3b467f41ee58575764f3ba84937f76e4"
},
"dist": {
"type": "zip",
"url": "https://github.com/doctrine/doctrine2/zipball/5d2a3bcb3b467f41ee58575764f3ba84937f76e4",
"reference": "5d2a3bcb3b467f41ee58575764f3ba84937f76e4",
"shasum": ""
},
"require": {
"php": ">=5.3.2",
"ext-pdo": "*",
"doctrine/common": "2.2.*",
"doctrine/dbal": "2.2.*"
},
"type": "library",
"installation-source": "source",
"license": [
"LGPL"
],
"authors": [
{
"name": "Jonathan Wage",
"email": "jonwage@gmail.com",
"homepage": "http://www.jwage.com/",
"role": null
},
{
"name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com",
"homepage": null,
"role": null
},
{
"name": "Roman Borschel",
"email": "roman@code-factory.org",
"homepage": null,
"role": null
},
{
"name": "Benjamin Eberlei",
"email": "kontakt@beberlei.de",
"homepage": null,
"role": null
}
],
"description": "Object-Relational-Mapper for PHP",
"homepage": "http://www.doctrine-project.org",
"keywords": [
"database",
"orm"
],
"autoload": {
"psr-0": {
"Doctrine\\ORM": "lib/"
}
}
},
{
"name": "swiftmailer/swiftmailer",
"version": "dev-master",
"version_normalized": "9999999-dev",
"time": "2012-07-08 09:21:00",
"time": "2012-07-13 12:47:17",
"source": {
"type": "git",
"url": "git://github.com/swiftmailer/swiftmailer.git",
"reference": "f51b5f33c83b48faea75f1285f99a2e8f1c66f75"
"reference": "8b2aa953f87da228ba413e8fb1372e49c1374050"
},
"dist": {
"type": "zip",
"url": "https://github.com/swiftmailer/swiftmailer/zipball/f51b5f33c83b48faea75f1285f99a2e8f1c66f75",
"reference": "f51b5f33c83b48faea75f1285f99a2e8f1c66f75",
"url": "https://github.com/swiftmailer/swiftmailer/zipball/8b2aa953f87da228ba413e8fb1372e49c1374050",
"reference": "8b2aa953f87da228ba413e8fb1372e49c1374050",
"shasum": ""
},
"require": {
@ -964,91 +1073,26 @@
]
}
},
{
"name": "doctrine/dbal",
"version": "2.2.x-dev",
"version_normalized": "2.2.9999999.9999999-dev",
"time": "2012-07-08 18:30:35",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal",
"reference": "b961a3fce6bf220f1dca47d7d747b9074bea4730"
},
"dist": {
"type": "zip",
"url": "https://github.com/doctrine/dbal/zipball/b961a3fce6bf220f1dca47d7d747b9074bea4730",
"reference": "b961a3fce6bf220f1dca47d7d747b9074bea4730",
"shasum": ""
},
"require": {
"php": ">=5.3.2",
"doctrine/common": ">=2.2.0,<=2.2.99"
},
"type": "library",
"installation-source": "source",
"license": [
"LGPL"
],
"authors": [
{
"name": "Jonathan Wage",
"email": "jonwage@gmail.com",
"homepage": "http://www.jwage.com/",
"role": null
},
{
"name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com",
"homepage": null,
"role": null
},
{
"name": "Roman Borschel",
"email": "roman@code-factory.org",
"homepage": null,
"role": null
},
{
"name": "Benjamin Eberlei",
"email": "kontakt@beberlei.de",
"homepage": null,
"role": null
}
],
"description": "Database Abstraction Layer",
"homepage": "http://www.doctrine-project.org",
"keywords": [
"database",
"persistence",
"dbal",
"queryobject"
],
"autoload": {
"psr-0": {
"Doctrine\\DBAL": "lib/"
}
}
},
{
"name": "symfony/symfony",
"version": "dev-master",
"version_normalized": "9999999-dev",
"time": "2012-07-09 05:52:38",
"time": "2012-07-15 16:27:15",
"source": {
"type": "git",
"url": "git://github.com/symfony/symfony.git",
"reference": "v2.1.0-BETA2"
"reference": "151b79a6ce3f459e2fa8815cd9f2786eef750993"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/symfony/zipball/v2.1.0-BETA2",
"reference": "v2.1.0-BETA2",
"url": "https://github.com/symfony/symfony/zipball/151b79a6ce3f459e2fa8815cd9f2786eef750993",
"reference": "151b79a6ce3f459e2fa8815cd9f2786eef750993",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
"twig/twig": ">=1.8,<2.0-dev",
"doctrine/common": ">2.2,<2.4-dev"
"doctrine/common": ">2.2,<2.4-dev",
"php": ">=5.3.3"
},
"replace": {
"symfony/doctrine-bridge": "self.version",
@ -1135,16 +1179,16 @@
"version": "dev-master",
"version_normalized": "9999999-dev",
"target-dir": "Sensio/Bundle/DistributionBundle",
"time": "2012-07-08 08:02:21",
"time": "2012-07-15 10:24:10",
"source": {
"type": "git",
"url": "https://github.com/sensio/SensioDistributionBundle",
"reference": "9a7dbd867fd5061e4bfd660a175aa66122f53d25"
"reference": "5886adae1613c0a72fbb95259a83ae798e86c0d3"
},
"dist": {
"type": "zip",
"url": "https://github.com/sensio/SensioDistributionBundle/zipball/9a7dbd867fd5061e4bfd660a175aa66122f53d25",
"reference": "9a7dbd867fd5061e4bfd660a175aa66122f53d25",
"url": "https://github.com/sensio/SensioDistributionBundle/zipball/5886adae1613c0a72fbb95259a83ae798e86c0d3",
"reference": "5886adae1613c0a72fbb95259a83ae798e86c0d3",
"shasum": ""
},
"require": {

@ -0,0 +1 @@
Subproject commit ca9d4a631577d7195c6517dd89ae8a3cc02b85ba

@ -31,7 +31,7 @@ class ScriptHandler
return;
}
static::executeBuildBootstrap($appDir);
static::executeBuildBootstrap($appDir, $options['process-timeout']);
}
public static function clearCache($event)
@ -45,7 +45,7 @@ class ScriptHandler
return;
}
static::executeCommand($event, $appDir, 'cache:clear --no-warmup');
static::executeCommand($event, $appDir, 'cache:clear --no-warmup', $options['process-timeout']);
}
public static function installAssets($event)
@ -123,7 +123,7 @@ namespace { return \$loader; }
", substr(file_get_contents($file), 5)));
}
protected static function executeCommand($event, $appDir, $cmd)
protected static function executeCommand($event, $appDir, $cmd, $timeout = 300)
{
$php = escapeshellarg(self::getPhp());
$console = escapeshellarg($appDir.'/console');
@ -131,17 +131,17 @@ namespace { return \$loader; }
$console.= ' --ansi';
}
$process = new Process($php.' '.$console.' '.$cmd, null, null, null, 300);
$process = new Process($php.' '.$console.' '.$cmd, null, null, null, $timeout);
$process->run(function ($type, $buffer) { echo $buffer; });
}
protected static function executeBuildBootstrap($appDir)
protected static function executeBuildBootstrap($appDir, $timeout = 300)
{
$php = escapeshellarg(self::getPhp());
$cmd = escapeshellarg(__DIR__.'/../Resources/bin/build_bootstrap.php');
$appDir = escapeshellarg($appDir);