diff --git a/.gitignore b/.gitignore
index 00f5a5eaac..d23e164b5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,12 @@
-/web/bundles/
-/app/bootstrap.php.cache
-/app/cache/*
/app/config/parameters.yml
-/app/logs/*
-!app/cache/.gitkeep
-!app/logs/.gitkeep
-/app/phpunit.xml
/build/
+/phpunit.xml
+/var/bootstrap.php.cache
+/var/cache/*
+!var/cache/.gitkeep
+/var/logs/*
+!var/logs/.gitkeep
+/var/sessions/*
+!var/sessions/.gitkeep
/vendor/
-/composer.phar
+/web/bundles/
diff --git a/UPGRADE-2.2.md b/UPGRADE-2.2.md
deleted file mode 100644
index cad9eeb632..0000000000
--- a/UPGRADE-2.2.md
+++ /dev/null
@@ -1,30 +0,0 @@
-UPGRADE FROM 2.1 to 2.2
-=======================
-
- * The [`web/.htaccess`](https://github.com/symfony/symfony-standard/blob/2.2/web/.htaccess)
- file has been enhanced substantially to prevent duplicate content with and
- without `/app.php` in the URI. It also improves functionality when using
- Apache aliases or when mod_rewrite is not available. So you might want to
- update your `.htaccess` file as well.
-
- * The ``_internal`` route is not used any more. It should then be removed
- from both your routing and security configurations. A ``fragments`` key has
- been added to the framework configuration and must be specified when ESI or
- Hinclude are in use. No security configuration is required for this path as
- by default ESI access is only permitted for trusted hosts and Hinclude
- access uses an URL signing mechanism.
-
- ```
- framework:
- # ...
- fragments: { path: /_proxy }
- ```
-
-Functional Tests
-----------------
-
- * The profiler has been disabled by default in the test environment. You can
- enable it again by modifying the ``config_test.yml`` configuration file or
- even better, you can just enable it for the very next request by calling
- ``$client->enableProfiler()`` when you need the profiler in a test (that
- speeds up functional tests quite a bit).
diff --git a/UPGRADE-2.3.md b/UPGRADE-2.3.md
deleted file mode 100644
index eb4b3ec209..0000000000
--- a/UPGRADE-2.3.md
+++ /dev/null
@@ -1,52 +0,0 @@
-UPGRADE FROM 2.2 to 2.3
-=======================
-
-When upgrading Symfony from 2.2 to 2.3, you need to do the following changes
-to the code that came from the Standard Edition:
-
- * The debugging tools are not enabled by default anymore and should be added
- to the
- [`web/app_dev.php`](https://github.com/symfony/symfony-standard/blob/2.3/web/app_dev.php)
- front controller manually, just after including the bootstrap cache:
-
- use Symfony\Component\Debug\Debug;
-
- Debug::enable();
-
- You also need to enable debugging in the
- [`app/console`](https://github.com/symfony/symfony-standard/blob/2.3/app/console)
- script, after the `$debug` variable is defined:
-
- use Symfony\Component\Debug\Debug;
-
- if ($debug) {
- Debug::enable();
- }
-
- * The `parameters.yml` file can now be managed by the
- `incenteev/composer-parameter-handler` bundle that comes with the 2.3
- Standard Edition:
-
- * add `"incenteev/composer-parameter-handler": "~2.0"` to your
- `composer.json` file;
-
- * add `/app/config/parameters.yml` to your `.gitignore` file;
-
- * create a
- [`app/config/parameters.yml.dist`](https://github.com/symfony/symfony-standard/blob/2.3/app/config/parameters.yml.dist)
- file with sensible values for all your parameters.
-
- * It is highly recommended that you switch the minimum stability to `stable`
- in your `composer.json` file.
-
- * If you are using Apache, have a look at the new
- [`.htaccess`](https://github.com/symfony/symfony-standard/blob/2.3/web/.htaccess)
- configuration and change yours accordingly.
-
- * In the
- [`app/autoload.php`](https://github.com/symfony/symfony-standard/blob/2.3/app/autoload.php)
- file, the section about `intl` should be removed as it is not needed anymore.
-
-You can also have a look at the
-[diff](https://github.com/symfony/symfony-standard/compare/v2.2.0%E2%80%A62.3)
-between the 2.2 version of the Standard Edition and the 2.3 version.
diff --git a/UPGRADE-2.4.md b/UPGRADE-2.4.md
deleted file mode 100644
index a3e33954f9..0000000000
--- a/UPGRADE-2.4.md
+++ /dev/null
@@ -1,9 +0,0 @@
-UPGRADE FROM 2.3 to 2.4
-=======================
-
-When upgrading Symfony from 2.3 to 2.4, you need to do the following changes
-to the code that came from the Standard Edition:
-
- * We recommend to comment or remove the `firephp` and `chromephp` Monolog
- handlers as they might cause issues with some configuration (`chromephp`
- with Nginx for instance).
diff --git a/UPGRADE.md b/UPGRADE.md
deleted file mode 100644
index a206d37fab..0000000000
--- a/UPGRADE.md
+++ /dev/null
@@ -1,268 +0,0 @@
-Symfony Standard Edition Upgrade
-================================
-
-From Symfony 2.0 to Symfony 2.1
--------------------------------
-
-### Project Dependencies
-
-As of Symfony 2.1, project dependencies are managed by
-[Composer](http://getcomposer.org/):
-
-* The `bin/vendors` script can be removed as `composer.phar` does all the work
- now (it is recommended to install it globally on your machine).
-
-* The `deps` file need to be replaced with the `composer.json` one.
-
-* The `composer.lock` is the equivalent of the generated `deps.lock` file and
- it is automatically generated by Composer.
-
-Download the default
-[`composer.json`](https://raw.github.com/symfony/symfony-standard/2.1/composer.json)
-and
-[`composer.lock`](https://raw.github.com/symfony/symfony-standard/2.1/composer.lock)
-files for Symfony 2.1 and put them into the main directory of your project. If
-you have customized your `deps` file, move the added dependencies to the
-`composer.json` file (many bundles and PHP libraries are already available as
-Composer packages -- search for them on [Packagist](http://packagist.org/)).
-
-Remove your current `vendor` directory.
-
-Finally, run Composer:
-
- $ composer.phar install
-
-Note: You must complete the upgrade steps below so composer can successfully generate the autoload files.
-
-### `app/autoload.php`
-
-The default `autoload.php` reads as follows (it has been simplified a lot as
-autoloading for libraries and bundles declared in your `composer.json` file is
-automatically managed by the Composer autoloader):
-
- add('', __DIR__.'/../vendor/symfony/symfony/src/Symfony/Component/Locale/Resources/stubs');
- }
-
- AnnotationRegistry::registerLoader(array($loader, 'loadClass'));
-
- return $loader;
-
-### `app/config/config.yml`
-
-The `framework.charset` setting must be removed. If you are not using `UTF-8`
-for your application, override the `getCharset()` method in your `AppKernel`
-class instead:
-
- class AppKernel extends Kernel
- {
- public function getCharset()
- {
- return 'ISO-8859-1';
- }
-
- // ...
- }
-
-You might want to add the new `strict_requirements` parameter to
-`framework.router` (it avoids fatal errors in the production environment when
-a link cannot be generated):
-
- framework:
- router:
- strict_requirements: "%kernel.debug%"
-
-You can even disable the requirements check on production with `null` as you should
-know that the parameters for URL generation always pass the requirements, e.g. by
-validating them beforehand. This additionally enhances performance. See
-[config_prod.yml](https://github.com/symfony/symfony-standard/blob/master/app/config/config_prod.yml).
-
-The `default_locale` parameter is now a setting of the main `framework`
-configuration (it was under the `framework.session` in 2.0):
-
- framework:
- default_locale: "%locale%"
-
-The `auto_start` setting under `framework.session` must be removed as it is
-not used anymore (the session is now always started on-demand). If
-`auto_start` was the only setting under the `framework.session` entry, don't
-remove it entirely, but set its value to `~` (`~` means `null` in YAML)
-instead:
-
- framework:
- session: ~
-
-The `trust_proxy_headers` setting was added in the default configuration file
-(as it should be set to `true` when you install your application behind a
-reverse proxy):
-
- framework:
- trust_proxy_headers: false
-
-An empty `bundles` entry was added to the `assetic` configuration:
-
- assetic:
- bundles: []
-
-The default `swiftmailer` configuration now has the `spool` setting configured
-to the `memory` type to defer email sending after the response is sent to the
-user (recommended for better end-user performance):
-
- swiftmailer:
- spool: { type: memory }
-
-The `jms_security_extra` configuration was moved to the `security.yml`
-configuration file.
-
-### `app/config/config_dev.yml`
-
-An example of how to send all emails to a unique address was added:
-
- #swiftmailer:
- # delivery_address: me@example.com
-
-### `app/config/config_test.yml`
-
-The `storage_id` setting must be changed to `session.storage.mock_file`:
-
- framework:
- session:
- storage_id: session.storage.mock_file
-
-### `app/config/parameters.ini`
-
-The file has been converted to a YAML file which reads as follows:
-
- parameters:
- database_driver: pdo_mysql
- database_host: localhost
- database_port: ~
- database_name: symfony
- database_user: root
- database_password: ~
-
- mailer_transport: smtp
- mailer_host: localhost
- mailer_user: ~
- mailer_password: ~
-
- locale: en
- secret: ThisTokenIsNotSoSecretChangeIt
-
-Note that if you convert your parameters file to YAML, you must also change
-its reference in `app/config/config.yml`.
-
-### `app/config/routing_dev.yml`
-
-The `_assetic` entry was removed:
-
- #_assetic:
- # resource: .
- # type: assetic
-
-### `app/config/security.yml`
-
-Under `security.access_control`, the default rule for internal routes was changed:
-
- security:
- access_control:
- #- { path: ^/_internal/secure, roles: IS_AUTHENTICATED_ANONYMOUSLY, ip: 127.0.0.1 }
-
-Under `security.providers`, the `in_memory` example was updated to the following:
-
- security:
- providers:
- in_memory:
- memory:
- users:
- user: { password: userpass, roles: [ 'ROLE_USER' ] }
- admin: { password: adminpass, roles: [ 'ROLE_ADMIN' ] }
-
-### `app/AppKernel.php`
-
-The following bundles have been added to the list of default registered bundles:
-
- new JMS\AopBundle\JMSAopBundle(),
- new JMS\DiExtraBundle\JMSDiExtraBundle($this),
-
-You must also rename the DoctrineBundle from:
-
- new Symfony\Bundle\DoctrineBundle\DoctrineBundle(),
-
-to:
-
- new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
-
-### `web/app.php`
-
-The default `web/app.php` file now reads as follows:
-
- register(true);
- */
-
- require_once __DIR__.'/../app/AppKernel.php';
- //require_once __DIR__.'/../app/AppCache.php';
-
- $kernel = new AppKernel('prod', false);
- $kernel->loadClassCache();
- //$kernel = new AppCache($kernel);
- $request = Request::createFromGlobals();
- $response = $kernel->handle($request);
- $response->send();
- $kernel->terminate($request, $response);
-
-### `web/app_dev.php`
-
-The default `web/app_dev.php` file now reads as follows:
-
- loadClassCache();
- $request = Request::createFromGlobals();
- $response = $kernel->handle($request);
- $response->send();
- $kernel->terminate($request, $response);
diff --git a/app/AppKernel.php b/app/AppKernel.php
index 1e8325cd24..3c72baec76 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -29,6 +29,21 @@ public function registerBundles()
return $bundles;
}
+ public function getRootDir()
+ {
+ return __DIR__;
+ }
+
+ public function getCacheDir()
+ {
+ return dirname(__DIR__).'/var/cache/'.$this->environment;
+ }
+
+ public function getLogDir()
+ {
+ return dirname(__DIR__).'/var/logs';
+ }
+
public function registerContainerConfiguration(LoaderInterface $loader)
{
$loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml');
diff --git a/app/config/config.yml b/app/config/config.yml
index b4a2d0a4c2..3265fcacfb 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -28,8 +28,10 @@ framework:
session:
# handler_id set to null will use default session handler from php.ini
handler_id: ~
+ save_path: %kernel.root_dir%/../var/sessions/%kernel.environment%
fragments: ~
http_method_override: true
+ assets: ~
# Twig Configuration
twig:
diff --git a/app/phpunit.xml.dist b/app/phpunit.xml.dist
deleted file mode 100644
index dc1bf70bde..0000000000
--- a/app/phpunit.xml.dist
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-
- ../src/*/*Bundle/Tests
- ../src/*/Bundle/*Bundle/Tests
- ../src/*Bundle/Tests
-
-
-
-
-
-
-
- ../src
-
- ../src/*Bundle/Resources
- ../src/*Bundle/Tests
- ../src/*/*Bundle/Resources
- ../src/*/*Bundle/Tests
- ../src/*/Bundle/*Bundle/Resources
- ../src/*/Bundle/*Bundle/Tests
-
-
-
-
diff --git a/app/console b/bin/console
similarity index 95%
rename from app/console
rename to bin/console
index 7c357dbd24..24f9e84d21 100755
--- a/app/console
+++ b/bin/console
@@ -15,7 +15,7 @@ set_time_limit(0);
* @var Composer\Autoload\ClassLoader $loader
*/
$loader = require __DIR__.'/../app/autoload.php';
-require_once __DIR__.'/AppKernel.php';
+require_once __DIR__.'/../app/AppKernel.php';
$input = new ArgvInput();
$env = $input->getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'dev');
diff --git a/app/check.php b/bin/symfony_requirements
old mode 100644
new mode 100755
similarity index 97%
rename from app/check.php
rename to bin/symfony_requirements
index 282507f703..1eca6719c4
--- a/app/check.php
+++ b/bin/symfony_requirements
@@ -1,6 +1,7 @@
+#!/usr/bin/env php
=5.3.9",
"sensiolabs/security-checker": "~3.0",
- "symfony/class-loader": "~2.2",
- "symfony/framework-bundle": "~2.3",
- "symfony/process": "~2.2"
- },
- "require-dev": {
- "symfony/form": "~2.2",
- "symfony/validator": "~2.2",
- "symfony/yaml": "~2.2"
- },
- "suggest": {
- "symfony/form": "If you want to use the configurator",
- "symfony/validator": "If you want to use the configurator",
- "symfony/yaml": "If you want to use the configurator"
+ "symfony/class-loader": "~2.3|~3.0",
+ "symfony/config": "~2.3|~3.0",
+ "symfony/dependency-injection": "~2.3|~3.0",
+ "symfony/filesystem": "~2.3|~3.0",
+ "symfony/http-kernel": "~2.3|~3.0",
+ "symfony/process": "~2.3|~3.0"
},
"type": "symfony-bundle",
"extra": {
"branch-alias": {
- "dev-master": "4.0.x-dev"
+ "dev-master": "5.0.x-dev"
}
},
"autoload": {
- "psr-0": {
- "Sensio\\Bundle\\DistributionBundle": ""
+ "psr-4": {
+ "Sensio\\Bundle\\DistributionBundle\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1119,7 +1112,7 @@
"configuration",
"distribution"
],
- "time": "2015-08-03 10:07:56"
+ "time": "2015-09-16 06:59:07"
},
{
"name": "sensio/framework-extra-bundle",
@@ -1345,28 +1338,28 @@
},
{
"name": "symfony/monolog-bundle",
- "version": "v2.7.1",
+ "version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/symfony/MonologBundle.git",
- "reference": "9320b6863404c70ebe111e9040dab96f251de7ac"
+ "reference": "3cf6864d23a6f32eb01018d2309d855abe4ab3bb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/MonologBundle/zipball/9320b6863404c70ebe111e9040dab96f251de7ac",
- "reference": "9320b6863404c70ebe111e9040dab96f251de7ac",
+ "url": "https://api.github.com/repos/symfony/MonologBundle/zipball/3cf6864d23a6f32eb01018d2309d855abe4ab3bb",
+ "reference": "3cf6864d23a6f32eb01018d2309d855abe4ab3bb",
"shasum": ""
},
"require": {
"monolog/monolog": "~1.8",
"php": ">=5.3.2",
- "symfony/config": "~2.3",
- "symfony/dependency-injection": "~2.3",
- "symfony/http-kernel": "~2.3",
- "symfony/monolog-bridge": "~2.3"
+ "symfony/config": "~2.3|3.*",
+ "symfony/dependency-injection": "~2.3|3.*",
+ "symfony/http-kernel": "~2.3|3.*",
+ "symfony/monolog-bridge": "~2.3|3.*"
},
"require-dev": {
- "symfony/console": "~2.3",
+ "symfony/console": "~2.3|3.*",
"symfony/yaml": "~2.3"
},
"type": "symfony-bundle",
@@ -1400,38 +1393,33 @@
"log",
"logging"
],
- "time": "2015-01-04 20:21:17"
+ "time": "2015-09-20 19:20:38"
},
{
- "name": "symfony/security-acl",
+ "name": "symfony/swiftmailer-bridge",
"version": "v2.7.4",
"source": {
"type": "git",
- "url": "https://github.com/symfony/security-acl.git",
- "reference": "ba1f9cea95fcf17f2f9549590a26bd0ca07cd06e"
+ "url": "https://github.com/symfony/SwiftmailerBridge.git",
+ "reference": "2df804950391861f9b23f3bf7f42fbb4bfd2262b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/security-acl/zipball/ba1f9cea95fcf17f2f9549590a26bd0ca07cd06e",
- "reference": "ba1f9cea95fcf17f2f9549590a26bd0ca07cd06e",
+ "url": "https://api.github.com/repos/symfony/SwiftmailerBridge/zipball/2df804950391861f9b23f3bf7f42fbb4bfd2262b",
+ "reference": "2df804950391861f9b23f3bf7f42fbb4bfd2262b",
"shasum": ""
},
"require": {
"php": ">=5.3.9",
- "symfony/security-core": "~2.4"
+ "swiftmailer/swiftmailer": ">=4.2.0,<6.0-dev"
},
"require-dev": {
- "doctrine/common": "~2.2",
- "doctrine/dbal": "~2.2",
- "psr/log": "~1.0",
"symfony/phpunit-bridge": "~2.7"
},
"suggest": {
- "doctrine/dbal": "For using the built-in ACL implementation",
- "symfony/class-loader": "For using the ACL generateSql script",
- "symfony/finder": "For using the ACL generateSql script"
+ "symfony/http-kernel": ""
},
- "type": "library",
+ "type": "symfony-bridge",
"extra": {
"branch-alias": {
"dev-master": "2.7-dev"
@@ -1439,7 +1427,7 @@
},
"autoload": {
"psr-4": {
- "Symfony\\Component\\Security\\Acl\\": ""
+ "Symfony\\Bridge\\Swiftmailer\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1456,9 +1444,9 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony Security Component - ACL (Access Control List)",
+ "description": "Symfony Swiftmailer Bridge",
"homepage": "https://symfony.com",
- "time": "2015-08-24 07:13:45"
+ "time": "2015-06-08 09:37:21"
},
{
"name": "symfony/swiftmailer-bundle",
@@ -1519,85 +1507,82 @@
},
{
"name": "symfony/symfony",
- "version": "2.8.x-dev",
+ "version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/symfony/symfony.git",
- "reference": "fbba5d95ccb49439a6cce38e22b26511f4d81c81"
+ "reference": "111bdc5294967b0497d5a6c6ce9b6771b95c235b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/symfony/zipball/fbba5d95ccb49439a6cce38e22b26511f4d81c81",
- "reference": "fbba5d95ccb49439a6cce38e22b26511f4d81c81",
+ "url": "https://api.github.com/repos/symfony/symfony/zipball/111bdc5294967b0497d5a6c6ce9b6771b95c235b",
+ "reference": "111bdc5294967b0497d5a6c6ce9b6771b95c235b",
"shasum": ""
},
"require": {
- "doctrine/common": "~2.3",
- "php": ">=5.3.9",
+ "doctrine/common": "~2.4",
+ "php": ">=5.5.9",
"psr/log": "~1.0",
- "symfony/security-acl": "~2.7",
"twig/twig": "~1.20|~2.0"
},
"replace": {
"symfony/asset": "self.version",
"symfony/browser-kit": "self.version",
"symfony/class-loader": "self.version",
- "symfony/config": "self.version",
- "symfony/console": "self.version",
+ "symfony/config": "2.99.99",
+ "symfony/console": "2.99.99",
"symfony/css-selector": "self.version",
"symfony/debug": "self.version",
"symfony/debug-bundle": "self.version",
- "symfony/dependency-injection": "self.version",
- "symfony/doctrine-bridge": "self.version",
+ "symfony/dependency-injection": "2.99.99",
+ "symfony/doctrine-bridge": "2.99.99",
"symfony/dom-crawler": "self.version",
- "symfony/event-dispatcher": "self.version",
- "symfony/expression-language": "self.version",
- "symfony/filesystem": "self.version",
+ "symfony/event-dispatcher": "2.99.99",
+ "symfony/expression-language": "2.99.99",
+ "symfony/filesystem": "2.99.99",
"symfony/finder": "self.version",
"symfony/form": "self.version",
- "symfony/framework-bundle": "self.version",
+ "symfony/framework-bundle": "2.99.99",
"symfony/http-foundation": "self.version",
"symfony/http-kernel": "self.version",
"symfony/intl": "self.version",
- "symfony/locale": "self.version",
"symfony/monolog-bridge": "self.version",
"symfony/options-resolver": "self.version",
- "symfony/process": "self.version",
+ "symfony/process": "2.99.99",
"symfony/property-access": "self.version",
"symfony/proxy-manager-bridge": "self.version",
"symfony/routing": "self.version",
- "symfony/security": "self.version",
+ "symfony/security": "2.99.99",
"symfony/security-bundle": "self.version",
"symfony/security-core": "self.version",
"symfony/security-csrf": "self.version",
"symfony/security-http": "self.version",
"symfony/serializer": "self.version",
- "symfony/stopwatch": "self.version",
- "symfony/swiftmailer-bridge": "self.version",
+ "symfony/stopwatch": "2.99.99",
"symfony/templating": "self.version",
"symfony/translation": "self.version",
"symfony/twig-bridge": "self.version",
"symfony/twig-bundle": "self.version",
- "symfony/validator": "self.version",
+ "symfony/validator": "2.99.99",
"symfony/var-dumper": "self.version",
"symfony/web-profiler-bundle": "self.version",
- "symfony/yaml": "self.version"
+ "symfony/yaml": "2.99.99"
},
"require-dev": {
"doctrine/data-fixtures": "1.0.*",
- "doctrine/dbal": "~2.2",
- "doctrine/doctrine-bundle": "~1.2",
- "doctrine/orm": "~2.2,>=2.2.3",
+ "doctrine/dbal": "~2.4",
+ "doctrine/doctrine-bundle": "~1.4",
+ "doctrine/orm": "~2.4,>=2.4.5",
"egulias/email-validator": "~1.2",
- "ircmaxell/password-compat": "~1.0",
"monolog/monolog": "~1.11",
"ocramius/proxy-manager": "~0.4|~1.0",
- "symfony/phpunit-bridge": "self.version"
+ "symfony/phpunit-bridge": "self.version",
+ "symfony/security-acl": "~2.8|~3.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.8-dev"
+ "dev-master": "3.0-dev"
}
},
"autoload": {
@@ -1637,20 +1622,20 @@
"keywords": [
"framework"
],
- "time": "2015-09-13 11:29:07"
+ "time": "2015-09-22 14:11:08"
},
{
"name": "twig/twig",
- "version": "v1.21.2",
+ "version": "v1.22.2",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "ddce1136beb8db29b9cd7dffa8ab518b978c9db3"
+ "reference": "79249fc8c9ff62e41e217e0c630e2e00bcadda6a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/ddce1136beb8db29b9cd7dffa8ab518b978c9db3",
- "reference": "ddce1136beb8db29b9cd7dffa8ab518b978c9db3",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/79249fc8c9ff62e41e217e0c630e2e00bcadda6a",
+ "reference": "79249fc8c9ff62e41e217e0c630e2e00bcadda6a",
"shasum": ""
},
"require": {
@@ -1663,7 +1648,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.21-dev"
+ "dev-master": "1.22-dev"
}
},
"autoload": {
@@ -1698,7 +1683,7 @@
"keywords": [
"templating"
],
- "time": "2015-09-09 05:28:51"
+ "time": "2015-09-22 13:59:32"
}
],
"packages-dev": [
@@ -1754,12 +1739,14 @@
"aliases": [],
"minimum-stability": "stable",
"stability-flags": {
- "symfony/symfony": 20
+ "symfony/symfony": 20,
+ "symfony/monolog-bundle": 20,
+ "sensio/distribution-bundle": 20
},
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
- "php": ">=5.3.9"
+ "php": ">=5.5.9"
},
"platform-dev": []
}
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 0000000000..9b191d432a
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+ src/*/*Bundle/Tests
+ src/*/Bundle/*Bundle/Tests
+ src/*Bundle/Tests
+
+
+
+
+
+
+
+
+
+ src
+
+ src/*Bundle/Resources
+ src/*Bundle/Tests
+ src/*/*Bundle/Resources
+ src/*/*Bundle/Tests
+ src/*/Bundle/*Bundle/Resources
+ src/*/Bundle/*Bundle/Tests
+
+
+
+
diff --git a/app/SymfonyRequirements.php b/var/SymfonyRequirements.php
similarity index 100%
rename from app/SymfonyRequirements.php
rename to var/SymfonyRequirements.php
diff --git a/app/cache/.gitkeep b/var/cache/.gitkeep
similarity index 100%
rename from app/cache/.gitkeep
rename to var/cache/.gitkeep
diff --git a/app/logs/.gitkeep b/var/logs/.gitkeep
similarity index 100%
rename from app/logs/.gitkeep
rename to var/logs/.gitkeep
diff --git a/var/sessions/.gitkeep b/var/sessions/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/web/app.php b/web/app.php
index 46e6b2f58b..f9dc39a840 100644
--- a/web/app.php
+++ b/web/app.php
@@ -6,7 +6,7 @@
* @var Composer\Autoload\ClassLoader
*/
$loader = require __DIR__.'/../app/autoload.php';
-include_once __DIR__.'/../app/bootstrap.php.cache';
+include_once __DIR__.'/../var/bootstrap.php.cache';
// Enable APC for autoloading to improve performance.
// You should change the ApcClassLoader first argument to a unique prefix
diff --git a/web/config.php b/web/config.php
index 162acfc7b2..08a418d231 100644
--- a/web/config.php
+++ b/web/config.php
@@ -1,5 +1,15 @@
-
- This script will guide you through the basic configuration of your project.
- You can also do the same by editing the ‘app/config/parameters.yml’ file directly.
+ This script analyzes your system to check whether is
+ ready to run Symfony applications.
@@ -103,14 +188,10 @@
-
Your configuration looks good to run Symfony.
+
All checks passed successfully. Your system is ready to run Symfony applications.