diff --git a/.gitignore b/.gitignore index 76f018f49..93821ad1c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,16 @@ /app/config/parameters.yml -/app/bootstrap.php.cache -/app/cache/* -/app/logs/* -!app/cache/.gitkeep -!app/logs/.gitkeep /build/ +/phpunit.xml +/var/* +!/var/cache +/var/cache/* +!var/cache/.gitkeep +!/var/logs +/var/logs/* +!var/logs/.gitkeep +!/var/sessions +/var/sessions/* +!var/sessions/.gitkeep +!var/SymfonyRequirements.php /vendor/ -/bin/ -/composer.phar -web/bundles/whiteoctoberpagerfanta +/web/bundles/ diff --git a/.travis.yml b/.travis.yml index 9b38a1e29..16dca3742 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,6 @@ cache: matrix: fast_finish: true include: - - php: 5.3 - - php: 5.4 - php: 5.5 - php: 5.6 - php: 7.0 @@ -25,4 +23,4 @@ install: - composer install script: - - phpunit -c app + - phpunit diff --git a/app/AppKernel.php b/app/AppKernel.php index 5cd5417aa..331b62f28 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -40,6 +40,21 @@ public function registerBundles() return $bundles; } + public function getRootDir() + { + return __DIR__; + } + + public function getCacheDir() + { + return dirname(__DIR__).'/var/cache/'.$this->getEnvironment(); + } + + public function getLogDir() + { + return dirname(__DIR__).'/var/logs'; + } + public function registerContainerConfiguration(LoaderInterface $loader) { $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml'); diff --git a/app/autoload.php b/app/autoload.php index b32da0f3a..fa582ecd0 100644 --- a/app/autoload.php +++ b/app/autoload.php @@ -3,13 +3,11 @@ use Doctrine\Common\Annotations\AnnotationRegistry; use Composer\Autoload\ClassLoader; -error_reporting(error_reporting() & ~E_USER_DEPRECATED); - /** * @var ClassLoader $loader */ $loader = require __DIR__.'/../vendor/autoload.php'; -AnnotationRegistry::registerLoader(array($loader, 'loadClass')); +AnnotationRegistry::registerLoader([$loader, 'loadClass']); return $loader; diff --git a/app/config/config.yml b/app/config/config.yml index 51ad02d7f..e7593898c 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -44,8 +44,8 @@ framework: trusted_hosts: ~ trusted_proxies: ~ session: - # handler_id set to null will use default session handler from php.ini - handler_id: ~ + handler_id: session.handler.native_file + save_path: "%kernel.root_dir%/../var/sessions/%kernel.environment%" fragments: ~ http_method_override: true assets: ~ @@ -77,7 +77,9 @@ doctrine: # them from the app/config/parameters.yml file. The reason is that config.yml # stores options that change the application behavior and parameters.yml # stores options that change from one server to another - url: "%database_url%" + driver: "pdo_sqlite" + # temp workaround for https://github.com/doctrine/dbal/issues/1106: define DB path here + path: "%kernel.root_dir%/../var/data/blog.sqlite" orm: auto_generate_proxy_classes: "%kernel.debug%" diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml index c35b81621..d387848e4 100644 --- a/app/config/config_prod.yml +++ b/app/config/config_prod.yml @@ -21,7 +21,7 @@ monolog: handler: nested nested: type: stream - path: "php://stderr" + path: "%kernel.logs_dir%/%kernel.environment%.log" level: debug console: type: console diff --git a/app/phpunit.xml.dist b/app/phpunit.xml.dist deleted file mode 100644 index 255330bd8..000000000 --- a/app/phpunit.xml.dist +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - ../src/*Bundle/Tests - ../src/*/*Bundle/Tests - ../src/*/Bundle/*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/appveyor.yml b/appveyor.yml index 34bfd4fa4..0368a4ce4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -27,4 +27,4 @@ install: test_script: - cd %APPVEYOR_BUILD_FOLDER% - - php phpunit.phar -c app --verbose + - php phpunit.phar --verbose diff --git a/app/console b/bin/console similarity index 94% rename from app/console rename to bin/console index 3b4c367c9..ca74e9361 100755 --- a/app/console +++ b/bin/console @@ -14,7 +14,7 @@ set_time_limit(0); /** * @var Composer\Autoload\ClassLoader $loader */ -$loader = require __DIR__.'/autoload.php'; +$loader = require __DIR__.'/../app/autoload.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 bd56279f3..7cd559a45 --- a/app/check.php +++ b/bin/symfony_requirements @@ -1,6 +1,7 @@ +#!/usr/bin/env php =5.3.9", "ext-pdo_sqlite" : "*", - "doctrine/doctrine-bundle" : "~1.5", - "doctrine/doctrine-fixtures-bundle" : "~2.2", - "doctrine/orm" : "~2.4", - "erusev/parsedown" : "~1.5", - "ezyang/htmlpurifier" : "~4.7", - "incenteev/composer-parameter-handler" : "~2.1", - "ircmaxell/password-compat" : "~1.0", - "leafo/scssphp" : "^0.4.0", - "patchwork/jsqueeze" : "~1.0", - "sensio/distribution-bundle" : "~5.0", - "sensio/framework-extra-bundle" : "~3.0", - "symfony/assetic-bundle" : "~2.6", - "symfony/monolog-bundle" : "~2.7", - "symfony/polyfill-intl-icu" : "^1.2", - "symfony/swiftmailer-bundle" : "~2.3", - "symfony/symfony" : "~2.8", - "twig/extensions" : "~1.2", + "doctrine/doctrine-bundle" : "^1.6", + "doctrine/doctrine-fixtures-bundle" : "^2.2", + "doctrine/orm" : "^2.5", + "erusev/parsedown" : "^1.5", + "ezyang/htmlpurifier" : "^4.7", + "incenteev/composer-parameter-handler" : "^2.0", + "ircmaxell/password-compat" : "^1.0", + "leafo/scssphp" : "^0.5", + "patchwork/jsqueeze" : "^2.0", + "sensio/distribution-bundle" : "^5.0", + "sensio/framework-extra-bundle" : "^3.0", + "symfony/assetic-bundle" : "^2.8", + "symfony/monolog-bundle" : "^2.8", + "symfony/swiftmailer-bundle" : "^2.3", + "symfony/symfony" : "^3.1", + "twig/extensions" : "^1.3", "white-october/pagerfanta-bundle" : "^1.0" }, "require-dev": { - "sensio/generator-bundle": "~3.0" + "sensio/generator-bundle" : "~3.0", + "symfony/phpunit-bridge" : "^3.0" }, "scripts": { "post-install-cmd": [ @@ -53,12 +53,15 @@ "config": { "bin-dir": "bin", "platform": { - "php": "5.3.9" + "php": "5.5.9" } }, "extra": { "symfony-app-dir": "app", + "symfony-bin-dir": "bin", + "symfony-var-dir": "var", "symfony-web-dir": "web", + "symfony-tests-dir": "tests", "symfony-assets-install": "relative", "incenteev-parameters": { "file": "app/config/parameters.yml", diff --git a/composer.lock b/composer.lock index 408992dfa..028e4770c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "caa66a1ad8db3228425dce5baef72a02", - "content-hash": "408013e0ab19e45b7d9e55a3da4821ea", + "hash": "26725ea27270d21f470e82fbc5b84138", + "content-hash": "232c69ccb84b8d9d4e3943855d2e9afe", "packages": [ { "name": "doctrine/annotations", @@ -77,33 +77,33 @@ }, { "name": "doctrine/cache", - "version": "v1.5.4", + "version": "v1.6.0", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "47cdc76ceb95cc591d9c79a36dc3794975b5d136" + "reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/47cdc76ceb95cc591d9c79a36dc3794975b5d136", - "reference": "47cdc76ceb95cc591d9c79a36dc3794975b5d136", + "url": "https://api.github.com/repos/doctrine/cache/zipball/f8af318d14bdb0eff0336795b428b547bd39ccb6", + "reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6", "shasum": "" }, "require": { - "php": ">=5.3.2" + "php": "~5.5|~7.0" }, "conflict": { "doctrine/common": ">2.2,<2.4" }, "require-dev": { - "phpunit/phpunit": ">=3.7", + "phpunit/phpunit": "~4.8|~5.0", "predis/predis": "~1.0", "satooshi/php-coveralls": "~0.6" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.5.x-dev" + "dev-master": "1.6.x-dev" } }, "autoload": { @@ -143,7 +143,7 @@ "cache", "caching" ], - "time": "2015-12-19 05:03:47" + "time": "2015-12-31 16:37:02" }, { "name": "doctrine/collections", @@ -213,16 +213,16 @@ }, { "name": "doctrine/common", - "version": "v2.5.3", + "version": "v2.6.1", "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "10f1f19651343f87573129ca970aef1a47a6f29e" + "reference": "a579557bc689580c19fee4e27487a67fe60defc0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/10f1f19651343f87573129ca970aef1a47a6f29e", - "reference": "10f1f19651343f87573129ca970aef1a47a6f29e", + "url": "https://api.github.com/repos/doctrine/common/zipball/a579557bc689580c19fee4e27487a67fe60defc0", + "reference": "a579557bc689580c19fee4e27487a67fe60defc0", "shasum": "" }, "require": { @@ -231,20 +231,20 @@ "doctrine/collections": "1.*", "doctrine/inflector": "1.*", "doctrine/lexer": "1.*", - "php": ">=5.3.2" + "php": "~5.5|~7.0" }, "require-dev": { - "phpunit/phpunit": "~3.7" + "phpunit/phpunit": "~4.8|~5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5.x-dev" + "dev-master": "2.7.x-dev" } }, "autoload": { - "psr-0": { - "Doctrine\\Common\\": "lib/" + "psr-4": { + "Doctrine\\Common\\": "lib/Doctrine/Common" } }, "notification-url": "https://packagist.org/downloads/", @@ -282,7 +282,7 @@ "persistence", "spl" ], - "time": "2015-12-25 13:10:16" + "time": "2015-12-25 13:18:31" }, { "name": "doctrine/data-fixtures", @@ -414,16 +414,16 @@ }, { "name": "doctrine/doctrine-bundle", - "version": "1.6.2", + "version": "1.6.3", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "e9c2ccf573b59b7cea566390f34254fed3c20ed9" + "reference": "fd51907c6c76acaa8a5234822a4f901c1500afc1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/e9c2ccf573b59b7cea566390f34254fed3c20ed9", - "reference": "e9c2ccf573b59b7cea566390f34254fed3c20ed9", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/fd51907c6c76acaa8a5234822a4f901c1500afc1", + "reference": "fd51907c6c76acaa8a5234822a4f901c1500afc1", "shasum": "" }, "require": { @@ -440,13 +440,14 @@ "phpunit/phpunit": "~4", "satooshi/php-coveralls": "~0.6.1", "symfony/phpunit-bridge": "~2.7|~3.0", + "symfony/property-info": "~2.8|~3.0", "symfony/validator": "~2.2|~3.0", "symfony/yaml": "~2.2|~3.0", "twig/twig": "~1.10" }, "suggest": { "doctrine/orm": "The Doctrine ORM integration is optional in the bundle.", - "symfony/web-profiler-bundle": "to use the data collector" + "symfony/web-profiler-bundle": "To use the data collector." }, "type": "symfony-bundle", "extra": { @@ -489,7 +490,7 @@ "orm", "persistence" ], - "time": "2016-01-10 17:21:44" + "time": "2016-04-21 19:55:56" }, { "name": "doctrine/doctrine-cache-bundle", @@ -703,6 +704,60 @@ ], "time": "2015-11-06 14:35:42" }, + { + "name": "doctrine/instantiator", + "version": "1.0.5", + "source": { + "type": "git", + "url": "https://github.com/doctrine/instantiator.git", + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", + "shasum": "" + }, + "require": { + "php": ">=5.3,<8.0-DEV" + }, + "require-dev": { + "athletic/athletic": "~0.1.8", + "ext-pdo": "*", + "ext-phar": "*", + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "http://ocramius.github.com/" + } + ], + "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", + "homepage": "https://github.com/doctrine/instantiator", + "keywords": [ + "constructor", + "instantiate" + ], + "time": "2015-06-14 21:17:01" + }, { "name": "doctrine/lexer", "version": "v1.0.1", @@ -759,28 +814,31 @@ }, { "name": "doctrine/orm", - "version": "v2.4.8", + "version": "v2.5.4", "source": { "type": "git", "url": "https://github.com/doctrine/doctrine2.git", - "reference": "5aedac1e5c5caaeac14798822c70325dc242d467" + "reference": "bc4ddbfb0114cb33438cc811c9a740d8aa304aab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/5aedac1e5c5caaeac14798822c70325dc242d467", - "reference": "5aedac1e5c5caaeac14798822c70325dc242d467", + "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/bc4ddbfb0114cb33438cc811c9a740d8aa304aab", + "reference": "bc4ddbfb0114cb33438cc811c9a740d8aa304aab", "shasum": "" }, "require": { - "doctrine/collections": "~1.1", - "doctrine/dbal": "~2.4", + "doctrine/cache": "~1.4", + "doctrine/collections": "~1.2", + "doctrine/common": ">=2.5-dev,<2.7-dev", + "doctrine/dbal": ">=2.5-dev,<2.6-dev", + "doctrine/instantiator": "~1.0.1", "ext-pdo": "*", - "php": ">=5.3.2", - "symfony/console": "~2.0" + "php": ">=5.4", + "symfony/console": "~2.5|~3.0" }, "require-dev": { - "satooshi/php-coveralls": "dev-master", - "symfony/yaml": "~2.1" + "phpunit/phpunit": "~4.0", + "symfony/yaml": "~2.3|~3.0" }, "suggest": { "symfony/yaml": "If you want to use YAML Metadata Mapping Driver" @@ -792,7 +850,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.4.x-dev" + "dev-master": "2.6.x-dev" } }, "autoload": { @@ -828,7 +886,7 @@ "database", "orm" ], - "time": "2015-08-31 13:19:01" + "time": "2016-01-05 21:34:58" }, { "name": "erusev/parsedown", @@ -1135,20 +1193,20 @@ }, { "name": "leafo/scssphp", - "version": "v0.4.0", + "version": "v0.5.1", "source": { "type": "git", "url": "https://github.com/leafo/scssphp.git", - "reference": "78a6f27aa4eaf70bb3ff4d13b639bab71fdaf47a" + "reference": "251cd10c1c86d9df20d54d3856ba30acdbdaab5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/leafo/scssphp/zipball/78a6f27aa4eaf70bb3ff4d13b639bab71fdaf47a", - "reference": "78a6f27aa4eaf70bb3ff4d13b639bab71fdaf47a", + "url": "https://api.github.com/repos/leafo/scssphp/zipball/251cd10c1c86d9df20d54d3856ba30acdbdaab5b", + "reference": "251cd10c1c86d9df20d54d3856ba30acdbdaab5b", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=5.4.0" }, "require-dev": { "kherge/box": "~2.5", @@ -1160,9 +1218,6 @@ ], "type": "library", "autoload": { - "classmap": [ - "classmap.php" - ], "psr-4": { "Leafo\\ScssPhp\\": "src/" } @@ -1187,7 +1242,7 @@ "scss", "stylesheet" ], - "time": "2015-11-09 14:44:09" + "time": "2015-11-11 22:15:07" }, { "name": "monolog/monolog", @@ -1336,16 +1391,16 @@ }, { "name": "paragonie/random_compat", - "version": "v1.4.1", + "version": "v2.0.2", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "c7e26a21ba357863de030f0b9e701c7d04593774" + "reference": "088c04e2f261c33bed6ca5245491cfca69195ccf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/c7e26a21ba357863de030f0b9e701c7d04593774", - "reference": "c7e26a21ba357863de030f0b9e701c7d04593774", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/088c04e2f261c33bed6ca5245491cfca69195ccf", + "reference": "088c04e2f261c33bed6ca5245491cfca69195ccf", "shasum": "" }, "require": { @@ -1380,29 +1435,34 @@ "pseudorandom", "random" ], - "time": "2016-03-18 20:34:03" + "time": "2016-04-03 06:00:07" }, { "name": "patchwork/jsqueeze", - "version": "v1.0.7", + "version": "v2.0.5", "source": { "type": "git", "url": "https://github.com/tchwork/jsqueeze.git", - "reference": "f90a933213534b93e4ff3c2c3026ff7458f7721b" + "reference": "693d64850eab2ce6a7c8f7cf547e1ab46e69d542" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tchwork/jsqueeze/zipball/f90a933213534b93e4ff3c2c3026ff7458f7721b", - "reference": "f90a933213534b93e4ff3c2c3026ff7458f7721b", + "url": "https://api.github.com/repos/tchwork/jsqueeze/zipball/693d64850eab2ce6a7c8f7cf547e1ab46e69d542", + "reference": "693d64850eab2ce6a7c8f7cf547e1ab46e69d542", "shasum": "" }, "require": { - "php": ">=5.1.4" + "php": ">=5.3.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, "autoload": { - "psr-0": { - "JSqueeze": "class/" + "psr-4": { + "Patchwork\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1422,7 +1482,53 @@ "javascript", "minification" ], - "time": "2015-03-25 10:11:08" + "time": "2016-04-19 09:28:22" + }, + { + "name": "psr/cache", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/cache.git", + "reference": "9e66031f41fbbdda45ee11e93c45d480ccba3eb3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/cache/zipball/9e66031f41fbbdda45ee11e93c45d480ccba3eb3", + "reference": "9e66031f41fbbdda45ee11e93c45d480ccba3eb3", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Cache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for caching libraries", + "keywords": [ + "cache", + "psr", + "psr-6" + ], + "time": "2015-12-11 02:52:07" }, { "name": "psr/log", @@ -1803,59 +1909,6 @@ ], "time": "2016-04-13 16:21:01" }, - { - "name": "symfony/polyfill-apcu", - "version": "v1.1.1", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-apcu.git", - "reference": "0c901e4e65a2f7ece68f0fd249b56d6ad3adc214" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/0c901e4e65a2f7ece68f0fd249b56d6ad3adc214", - "reference": "0c901e4e65a2f7ece68f0fd249b56d6ad3adc214", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting apcu_* functions to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "apcu", - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2016-03-03 16:49:40" - }, { "name": "symfony/polyfill-intl-icu", "version": "v1.2.0", @@ -1916,16 +1969,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.1.1", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "1289d16209491b584839022f29257ad859b8532d" + "reference": "dff51f72b0706335131b00a7f49606168c582594" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d", - "reference": "1289d16209491b584839022f29257ad859b8532d", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/dff51f72b0706335131b00a7f49606168c582594", + "reference": "dff51f72b0706335131b00a7f49606168c582594", "shasum": "" }, "require": { @@ -1937,7 +1990,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -1971,134 +2024,20 @@ "portable", "shim" ], - "time": "2016-01-20 09:13:37" - }, - { - "name": "symfony/polyfill-php54", - "version": "v1.1.1", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php54.git", - "reference": "9ba741ca01c77282ecf5796c2c1d667f03454ffb" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/9ba741ca01c77282ecf5796c2c1d667f03454ffb", - "reference": "9ba741ca01c77282ecf5796c2c1d667f03454ffb", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php54\\": "" - }, - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 5.4+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2016-01-25 19:13:00" - }, - { - "name": "symfony/polyfill-php55", - "version": "v1.1.1", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php55.git", - "reference": "b4f3f07d91702f8f926339fc4fcf81671d8c27e6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/b4f3f07d91702f8f926339fc4fcf81671d8c27e6", - "reference": "b4f3f07d91702f8f926339fc4fcf81671d8c27e6", - "shasum": "" - }, - "require": { - "ircmaxell/password-compat": "~1.0", - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php55\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 5.5+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2016-01-20 09:13:37" + "time": "2016-05-18 14:26:46" }, { "name": "symfony/polyfill-php56", - "version": "v1.1.1", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "4d891fff050101a53a4caabb03277284942d1ad9" + "reference": "3edf57a8fbf9a927533344cef65ad7e1cf31030a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/4d891fff050101a53a4caabb03277284942d1ad9", - "reference": "4d891fff050101a53a4caabb03277284942d1ad9", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/3edf57a8fbf9a927533344cef65ad7e1cf31030a", + "reference": "3edf57a8fbf9a927533344cef65ad7e1cf31030a", "shasum": "" }, "require": { @@ -2108,7 +2047,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -2141,30 +2080,30 @@ "portable", "shim" ], - "time": "2016-01-20 09:13:37" + "time": "2016-05-18 14:26:46" }, { "name": "symfony/polyfill-php70", - "version": "v1.1.1", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "386c1be9cad3ab531425211919e78c37971be4ce" + "reference": "a42f4b6b05ed458910f8af4c4e1121b0101b2d85" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/386c1be9cad3ab531425211919e78c37971be4ce", - "reference": "386c1be9cad3ab531425211919e78c37971be4ce", + "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/a42f4b6b05ed458910f8af4c4e1121b0101b2d85", + "reference": "a42f4b6b05ed458910f8af4c4e1121b0101b2d85", "shasum": "" }, "require": { - "paragonie/random_compat": "~1.0", + "paragonie/random_compat": "~1.0|~2.0", "php": ">=5.3.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -2200,20 +2139,20 @@ "portable", "shim" ], - "time": "2016-01-28 22:42:02" + "time": "2016-05-18 14:26:46" }, { "name": "symfony/polyfill-util", - "version": "v1.1.1", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-util.git", - "reference": "8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4" + "reference": "ef830ce3d218e622b221d6bfad42c751d974bf99" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4", - "reference": "8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4", + "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/ef830ce3d218e622b221d6bfad42c751d974bf99", + "reference": "ef830ce3d218e622b221d6bfad42c751d974bf99", "shasum": "" }, "require": { @@ -2222,7 +2161,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -2252,68 +2191,7 @@ "polyfill", "shim" ], - "time": "2016-01-20 09:13:37" - }, - { - "name": "symfony/security-acl", - "version": "v2.8.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/security-acl.git", - "reference": "4a3f7327ad215242c78f6564ad4ea6d2db1b8347" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/security-acl/zipball/4a3f7327ad215242c78f6564ad4ea6d2db1b8347", - "reference": "4a3f7327ad215242c78f6564ad4ea6d2db1b8347", - "shasum": "" - }, - "require": { - "php": ">=5.3.9", - "symfony/security-core": "~2.4|~3.0.0" - }, - "require-dev": { - "doctrine/common": "~2.2", - "doctrine/dbal": "~2.2", - "psr/log": "~1.0", - "symfony/phpunit-bridge": "~2.7|~3.0.0" - }, - "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" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.8-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Security\\Acl\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Security Component - ACL (Access Control List)", - "homepage": "https://symfony.com", - "time": "2015-12-28 09:39:09" + "time": "2016-05-18 14:26:46" }, { "name": "symfony/swiftmailer-bundle", @@ -2374,39 +2252,37 @@ }, { "name": "symfony/symfony", - "version": "v2.8.5", + "version": "v3.1.0", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "39ddd2383f4113cf67f8b28cde2c9d3fa340c3c2" + "reference": "e71d4713c506686e6cf027af44c97ee5d94c7db4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/39ddd2383f4113cf67f8b28cde2c9d3fa340c3c2", - "reference": "39ddd2383f4113cf67f8b28cde2c9d3fa340c3c2", + "url": "https://api.github.com/repos/symfony/symfony/zipball/e71d4713c506686e6cf027af44c97ee5d94c7db4", + "reference": "e71d4713c506686e6cf027af44c97ee5d94c7db4", "shasum": "" }, "require": { "doctrine/common": "~2.4", - "php": ">=5.3.9", + "php": ">=5.5.9", + "psr/cache": "~1.0", "psr/log": "~1.0", - "symfony/polyfill-apcu": "~1.1", "symfony/polyfill-intl-icu": "~1.0", "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php54": "~1.0", - "symfony/polyfill-php55": "~1.0", "symfony/polyfill-php56": "~1.0", "symfony/polyfill-php70": "~1.0", "symfony/polyfill-util": "~1.0", - "symfony/security-acl": "~2.7|~3.0.0", "twig/twig": "~1.23|~2.0" }, "conflict": { - "phpdocumentor/reflection": "<1.0.7" + "phpdocumentor/reflection-docblock": "<3.0" }, "replace": { "symfony/asset": "self.version", "symfony/browser-kit": "self.version", + "symfony/cache": "self.version", "symfony/class-loader": "self.version", "symfony/config": "self.version", "symfony/console": "self.version", @@ -2426,7 +2302,6 @@ "symfony/http-kernel": "self.version", "symfony/intl": "self.version", "symfony/ldap": "self.version", - "symfony/locale": "self.version", "symfony/monolog-bridge": "self.version", "symfony/options-resolver": "self.version", "symfony/process": "self.version", @@ -2442,7 +2317,6 @@ "symfony/security-http": "self.version", "symfony/serializer": "self.version", "symfony/stopwatch": "self.version", - "symfony/swiftmailer-bridge": "self.version", "symfony/templating": "self.version", "symfony/translation": "self.version", "symfony/twig-bridge": "self.version", @@ -2453,19 +2327,24 @@ "symfony/yaml": "self.version" }, "require-dev": { + "cache/integration-tests": "dev-master", + "doctrine/cache": "~1.6", "doctrine/data-fixtures": "1.0.*", "doctrine/dbal": "~2.4", - "doctrine/doctrine-bundle": "~1.2", + "doctrine/doctrine-bundle": "~1.4", "doctrine/orm": "~2.4,>=2.4.5", "egulias/email-validator": "~1.2", "monolog/monolog": "~1.11", "ocramius/proxy-manager": "~0.4|~1.0|~2.0", - "phpdocumentor/reflection": "^1.0.7" + "phpdocumentor/reflection-docblock": "^3.0", + "predis/predis": "~1.0", + "symfony/polyfill-apcu": "~1.1", + "symfony/security-acl": "~2.8|~3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -2504,7 +2383,7 @@ "keywords": [ "framework" ], - "time": "2016-04-29 15:34:08" + "time": "2016-05-30 07:24:54" }, { "name": "twig/extensions", @@ -2560,16 +2439,16 @@ }, { "name": "twig/twig", - "version": "v1.24.0", + "version": "v1.24.1", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8" + "reference": "3566d311a92aae4deec6e48682dc5a4528c4a512" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8", - "reference": "3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/3566d311a92aae4deec6e48682dc5a4528c4a512", + "reference": "3566d311a92aae4deec6e48682dc5a4528c4a512", "shasum": "" }, "require": { @@ -2617,7 +2496,7 @@ "keywords": [ "templating" ], - "time": "2016-01-25 21:22:18" + "time": "2016-05-30 09:11:59" }, { "name": "white-october/pagerfanta-bundle", @@ -2724,6 +2603,61 @@ ], "description": "This bundle generates code for you", "time": "2016-02-26 04:36:01" + }, + { + "name": "symfony/phpunit-bridge", + "version": "v3.1.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/phpunit-bridge.git", + "reference": "f5e7cdc9b5cd3f7d9b0228692cd6ec5736c3b074" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/f5e7cdc9b5cd3f7d9b0228692cd6ec5736c3b074", + "reference": "f5e7cdc9b5cd3f7d9b0228692cd6ec5736c3b074", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "suggest": { + "symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader" + }, + "type": "symfony-bridge", + "extra": { + "branch-alias": { + "dev-master": "3.1-dev" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Bridge\\PhpUnit\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony PHPUnit Bridge", + "homepage": "https://symfony.com", + "time": "2016-04-12 18:27:47" } ], "aliases": [], @@ -2737,6 +2671,6 @@ }, "platform-dev": [], "platform-overrides": { - "php": "5.3.9" + "php": "5.5.9" } } diff --git a/phpunit.xml.dist b/phpunit.xml.dist new file mode 100644 index 000000000..e0afaf7b9 --- /dev/null +++ b/phpunit.xml.dist @@ -0,0 +1,31 @@ + + + + + + + + + + + + src/*Bundle/Tests + + + + + + src + + src/*Bundle/Resources + src/*/*Bundle/Resources + src/*/Bundle/*Bundle/Resources + + + + 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 000000000..e69de29bb diff --git a/web/app.php b/web/app.php index 1ac90a1bc..2056915c2 100644 --- a/web/app.php +++ b/web/app.php @@ -12,7 +12,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'; // If your web server provides APC support for PHP applications, uncomment these // lines to use APC for class autoloading. This can improve application performance diff --git a/web/config.php b/web/config.php index 2e153097b..08a418d23 100644 --- a/web/config.php +++ b/web/config.php @@ -22,7 +22,7 @@ exit('This script is only accessible from localhost.'); } -require_once dirname(__FILE__).'/../app/SymfonyRequirements.php'; +require_once dirname(__FILE__).'/../var/SymfonyRequirements.php'; $symfonyRequirements = new SymfonyRequirements();