From 428c4cae8380b853bb4c5df6518803e49dac444d Mon Sep 17 00:00:00 2001 From: Reinier Kip Date: Wed, 3 Jun 2015 11:16:56 +0200 Subject: [PATCH 1/3] Update to Symfony 2.7 LTS. --- app/AppKernel.php | 1 - app/config/config.yml | 13 -- app/config/config_dev.yml | 3 - composer.json | 3 +- composer.lock | 337 ++++++++++++++++---------------------- 5 files changed, 144 insertions(+), 213 deletions(-) diff --git a/app/AppKernel.php b/app/AppKernel.php index f89dabe85..f77f0dda2 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -29,7 +29,6 @@ public function registerBundles() new Symfony\Bundle\TwigBundle\TwigBundle(), new Symfony\Bundle\MonologBundle\MonologBundle(), new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(), - new Symfony\Bundle\AsseticBundle\AsseticBundle(), new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(), new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(), new Nelmio\SecurityBundle\NelmioSecurityBundle(), diff --git a/app/config/config.yml b/app/config/config.yml index 15f5572d5..dfdab14a4 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -52,19 +52,6 @@ services: - [] # Allowed properties - [] # Allowed functions -# Assetic Configuration -assetic: - debug: "%kernel.debug%" - use_controller: false - bundles: [ ] - #java: /usr/bin/java - filters: - cssrewrite: ~ - #closure: - # jar: "%kernel.root_dir%/Resources/java/compiler.jar" - #yui_css: - # jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar" - # Doctrine Configuration doctrine: dbal: diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml index ad31b8eaa..7f8d9886b 100644 --- a/app/config/config_dev.yml +++ b/app/config/config_dev.yml @@ -25,9 +25,6 @@ monolog: # type: chromephp # level: info -assetic: - use_controller: "%use_assetic_controller%" - swiftmailer: port: 1025 diff --git a/composer.json b/composer.json index ffc6b26d5..799dcc941 100644 --- a/composer.json +++ b/composer.json @@ -13,14 +13,13 @@ "minimum-stability": "stable", "require": { "php": ">=5.4", - "symfony/symfony": "~2.6,>=2.6.6", + "symfony/symfony": "^2.7", "doctrine/dbal": "~2.5", "doctrine/orm": "~2.5", "doctrine/doctrine-bundle": "~1.4", "doctrine/common": "~2.5", "doctrine/cache": "~1.4", "twig/extensions": "~1.0", - "symfony/assetic-bundle": "~2.3", "symfony/swiftmailer-bundle": "~2.3", "symfony/monolog-bundle": "~2.4", "sensio/distribution-bundle": "~3.0", diff --git a/composer.lock b/composer.lock index a70665b89..a6882345d 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,10 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "54dc39246d0767f11ba13b7200a4d03f", + "hash": "b35d160513aaf5248479a97d77b5f526", "packages": [ { "name": "beberlei/assert", @@ -1592,77 +1592,6 @@ ], "time": "2013-06-08 14:08:19" }, - { - "name": "kriswallsmith/assetic", - "version": "v1.1.2", - "source": { - "type": "git", - "url": "https://github.com/kriswallsmith/assetic.git", - "reference": "735cffd3982c6e8cdebe292d5db39d077f65890f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/735cffd3982c6e8cdebe292d5db39d077f65890f", - "reference": "735cffd3982c6e8cdebe292d5db39d077f65890f", - "shasum": "" - }, - "require": { - "php": ">=5.3.1", - "symfony/process": "~2.1" - }, - "require-dev": { - "cssmin/cssmin": "*", - "joliclic/javascript-packer": "*", - "kamicane/packager": "*", - "leafo/lessphp": "*", - "leafo/scssphp": "*", - "leafo/scssphp-compass": "*", - "mrclay/minify": "*", - "phpunit/phpunit": "~3.7", - "ptachoire/cssembed": "*", - "twig/twig": "~1.6" - }, - "suggest": { - "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler", - "leafo/scssphp": "Assetic provides the integration with the scssphp SCSS compiler", - "leafo/scssphp-compass": "Assetic provides the integration with the SCSS compass plugin", - "ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris", - "twig/twig": "Assetic provides the integration with the Twig templating engine" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "psr-0": { - "Assetic": "src/" - }, - "files": [ - "src/functions.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Kris Wallsmith", - "email": "kris.wallsmith@gmail.com", - "homepage": "http://kriswallsmith.net/" - } - ], - "description": "Asset Management for PHP", - "homepage": "https://github.com/kriswallsmith/assetic", - "keywords": [ - "assets", - "compression", - "minification" - ], - "time": "2013-07-19 00:03:27" - }, { "name": "mockery/mockery", "version": "0.9.2", @@ -2064,29 +1993,36 @@ }, { "name": "sensio/distribution-bundle", - "version": "v3.0.6", + "version": "v3.0.28", "target-dir": "Sensio/Bundle/DistributionBundle", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "e20461e4f8e1afd68f36cf90bdccc06f7aa6a6c2" + "reference": "8175618b07793b9d43c3be931f3d8d4c14c9e866" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/e20461e4f8e1afd68f36cf90bdccc06f7aa6a6c2", - "reference": "e20461e4f8e1afd68f36cf90bdccc06f7aa6a6c2", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/8175618b07793b9d43c3be931f3d8d4c14c9e866", + "reference": "8175618b07793b9d43c3be931f3d8d4c14c9e866", "shasum": "" }, "require": { "php": ">=5.3.3", "sensiolabs/security-checker": "~2.0", "symfony/class-loader": "~2.2", + "symfony/framework-bundle": "~2.3", + "symfony/process": "~2.2" + }, + "require-dev": { "symfony/form": "~2.2", - "symfony/framework-bundle": "~2.4", - "symfony/process": "~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" + }, "type": "symfony-bundle", "extra": { "branch-alias": { @@ -2113,7 +2049,7 @@ "configuration", "distribution" ], - "time": "2014-09-24 14:47:46" + "time": "2015-06-01 15:04:20" }, { "name": "sensio/framework-extra-bundle", @@ -2273,7 +2209,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SURFnet/Stepup-bundle/zipball/cae60583cbb8907f5f2fa4730091765c59a4204a", + "url": "https://api.github.com/repos/SURFnet/Stepup-bundle/zipball/f0d4419e8be9a8738809ae35b0e2f4c30ac683df", "reference": "cae60583cbb8907f5f2fa4730091765c59a4204a", "shasum": "" }, @@ -2365,69 +2301,6 @@ ], "time": "2014-10-04 05:53:18" }, - { - "name": "symfony/assetic-bundle", - "version": "v2.3.0", - "target-dir": "Symfony/Bundle/AsseticBundle", - "source": { - "type": "git", - "url": "https://github.com/symfony/AsseticBundle.git", - "reference": "146dd3cb46b302bd471560471c6aaa930483dac1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/AsseticBundle/zipball/146dd3cb46b302bd471560471c6aaa930483dac1", - "reference": "146dd3cb46b302bd471560471c6aaa930483dac1", - "shasum": "" - }, - "require": { - "kriswallsmith/assetic": "~1.1", - "php": ">=5.3.0", - "symfony/framework-bundle": "~2.1" - }, - "require-dev": { - "symfony/class-loader": "~2.1", - "symfony/console": "~2.1", - "symfony/css-selector": "~2.1", - "symfony/dom-crawler": "~2.1", - "symfony/form": "~2.1", - "symfony/twig-bundle": "~2.1", - "symfony/yaml": "~2.1" - }, - "suggest": { - "symfony/twig-bundle": "~2.1" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "2.1.x-dev" - } - }, - "autoload": { - "psr-0": { - "Symfony\\Bundle\\AsseticBundle": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Kris Wallsmith", - "email": "kris.wallsmith@gmail.com", - "homepage": "http://kriswallsmith.net/" - } - ], - "description": "Integrates Assetic into Symfony2", - "homepage": "https://github.com/symfony/AsseticBundle", - "keywords": [ - "assets", - "compression", - "minification" - ], - "time": "2013-05-16 05:32:23" - }, { "name": "symfony/monolog-bundle", "version": "v2.6.1", @@ -2546,25 +2419,26 @@ }, { "name": "symfony/symfony", - "version": "v2.6.6", + "version": "v2.7.0", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "48c9e835a877adfb023b8b6d033d9dd14f342b4b" + "reference": "9975b1eca3de4db792a2c3e4e16f676a4aadcd46" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/48c9e835a877adfb023b8b6d033d9dd14f342b4b", - "reference": "48c9e835a877adfb023b8b6d033d9dd14f342b4b", + "url": "https://api.github.com/repos/symfony/symfony/zipball/9975b1eca3de4db792a2c3e4e16f676a4aadcd46", + "reference": "9975b1eca3de4db792a2c3e4e16f676a4aadcd46", "shasum": "" }, "require": { "doctrine/common": "~2.3", - "php": ">=5.3.3", + "php": ">=5.3.9", "psr/log": "~1.0", - "twig/twig": "~1.12,>=1.12.3" + "twig/twig": "~1.18" }, "replace": { + "symfony/asset": "self.version", "symfony/browser-kit": "self.version", "symfony/class-loader": "self.version", "symfony/config": "self.version", @@ -2588,7 +2462,6 @@ "symfony/monolog-bridge": "self.version", "symfony/options-resolver": "self.version", "symfony/process": "self.version", - "symfony/propel1-bridge": "self.version", "symfony/property-access": "self.version", "symfony/proxy-manager-bridge": "self.version", "symfony/routing": "self.version", @@ -2619,18 +2492,23 @@ "ircmaxell/password-compat": "~1.0", "monolog/monolog": "~1.11", "ocramius/proxy-manager": "~0.4|~1.0", - "propel/propel1": "~1.6", - "symfony/phpunit-bridge": "~2.7" + "symfony/phpunit-bridge": "self.version" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "2.7-dev" } }, "autoload": { - "psr-0": { - "Symfony\\": "src/" + "psr-4": { + "Symfony\\Bridge\\Doctrine\\": "src/Symfony/Bridge/Doctrine/", + "Symfony\\Bridge\\Monolog\\": "src/Symfony/Bridge/Monolog/", + "Symfony\\Bridge\\ProxyManager\\": "src/Symfony/Bridge/ProxyManager/", + "Symfony\\Bridge\\Swiftmailer\\": "src/Symfony/Bridge/Swiftmailer/", + "Symfony\\Bridge\\Twig\\": "src/Symfony/Bridge/Twig/", + "Symfony\\Bundle\\": "src/Symfony/Bundle/", + "Symfony\\Component\\": "src/Symfony/Component/" }, "classmap": [ "src/Symfony/Component/HttpFoundation/Resources/stubs", @@ -2645,33 +2523,33 @@ "MIT" ], "authors": [ - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, { "name": "Fabien Potencier", "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], "description": "The Symfony PHP framework", - "homepage": "http://symfony.com", + "homepage": "https://symfony.com", "keywords": [ "framework" ], - "time": "2015-04-01 16:55:26" + "time": "2015-05-30 16:52:28" }, { "name": "twig/extensions", "version": "v1.1.0", "source": { "type": "git", - "url": "https://github.com/fabpot/Twig-extensions.git", + "url": "https://github.com/twigphp/Twig-extensions.git", "reference": "c0ab818595338dd5569369bfce2552d02cec5d50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Twig-extensions/zipball/c0ab818595338dd5569369bfce2552d02cec5d50", + "url": "https://api.github.com/repos/twigphp/Twig-extensions/zipball/c0ab818595338dd5569369bfce2552d02cec5d50", "reference": "c0ab818595338dd5569369bfce2552d02cec5d50", "shasum": "" }, @@ -2711,25 +2589,25 @@ }, { "name": "twig/twig", - "version": "v1.16.0", + "version": "v1.18.1", "source": { "type": "git", - "url": "https://github.com/fabpot/Twig.git", - "reference": "8ce37115802e257a984a82d38254884085060024" + "url": "https://github.com/twigphp/Twig.git", + "reference": "9f70492f44398e276d1b81c1b43adfe6751c7b7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Twig/zipball/8ce37115802e257a984a82d38254884085060024", - "reference": "8ce37115802e257a984a82d38254884085060024", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/9f70492f44398e276d1b81c1b43adfe6751c7b7f", + "reference": "9f70492f44398e276d1b81c1b43adfe6751c7b7f", "shasum": "" }, "require": { - "php": ">=5.2.4" + "php": ">=5.2.7" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.16-dev" + "dev-master": "1.18-dev" } }, "autoload": { @@ -2755,7 +2633,7 @@ }, { "name": "Twig Team", - "homepage": "https://github.com/fabpot/Twig/graphs/contributors", + "homepage": "http://twig.sensiolabs.org/contributors", "role": "Contributors" } ], @@ -2764,7 +2642,7 @@ "keywords": [ "templating" ], - "time": "2014-07-05 12:19:05" + "time": "2015-04-19 08:30:27" } ], "packages-dev": [ @@ -2896,12 +2774,12 @@ "version": "v1.5.0", "source": { "type": "git", - "url": "https://github.com/Behat/Mink.git", + "url": "https://github.com/minkphp/Mink.git", "reference": "0769e6d9726c140a54dbf827a438c0f9912749fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/Mink/zipball/0769e6d9726c140a54dbf827a438c0f9912749fe", + "url": "https://api.github.com/repos/minkphp/Mink/zipball/0769e6d9726c140a54dbf827a438c0f9912749fe", "reference": "0769e6d9726c140a54dbf827a438c0f9912749fe", "shasum": "" }, @@ -2951,12 +2829,12 @@ "version": "v1.1.0", "source": { "type": "git", - "url": "https://github.com/Behat/MinkBrowserKitDriver.git", + "url": "https://github.com/minkphp/MinkBrowserKitDriver.git", "reference": "63960c8fcad4529faad1ff33e950217980baa64c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/MinkBrowserKitDriver/zipball/63960c8fcad4529faad1ff33e950217980baa64c", + "url": "https://api.github.com/repos/minkphp/MinkBrowserKitDriver/zipball/63960c8fcad4529faad1ff33e950217980baa64c", "reference": "63960c8fcad4529faad1ff33e950217980baa64c", "shasum": "" }, @@ -3057,12 +2935,12 @@ "version": "v1.0.9", "source": { "type": "git", - "url": "https://github.com/Behat/MinkGoutteDriver.git", + "url": "https://github.com/minkphp/MinkGoutteDriver.git", "reference": "fa1b073b48761464feb0b05e6825da44b20118d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/MinkGoutteDriver/zipball/fa1b073b48761464feb0b05e6825da44b20118d8", + "url": "https://api.github.com/repos/minkphp/MinkGoutteDriver/zipball/fa1b073b48761464feb0b05e6825da44b20118d8", "reference": "fa1b073b48761464feb0b05e6825da44b20118d8", "shasum": "" }, @@ -3108,12 +2986,12 @@ "version": "v1.1.1", "source": { "type": "git", - "url": "https://github.com/Behat/MinkSelenium2Driver.git", + "url": "https://github.com/minkphp/MinkSelenium2Driver.git", "reference": "bcf1b537de37db6db0822d9e7bd97e600fd7a476" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/MinkSelenium2Driver/zipball/bcf1b537de37db6db0822d9e7bd97e600fd7a476", + "url": "https://api.github.com/repos/minkphp/MinkSelenium2Driver/zipball/bcf1b537de37db6db0822d9e7bd97e600fd7a476", "reference": "bcf1b537de37db6db0822d9e7bd97e600fd7a476", "shasum": "" }, @@ -3264,12 +3142,12 @@ "version": "v1.0.6", "source": { "type": "git", - "url": "https://github.com/fabpot/Goutte.git", + "url": "https://github.com/FriendsOfPHP/Goutte.git", "reference": "06a5451288ffddd204b10fa6c6f9ab2b86dd515d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Goutte/zipball/06a5451288ffddd204b10fa6c6f9ab2b86dd515d", + "url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/06a5451288ffddd204b10fa6c6f9ab2b86dd515d", "reference": "06a5451288ffddd204b10fa6c6f9ab2b86dd515d", "shasum": "" }, @@ -3323,12 +3201,12 @@ "target-dir": "Guzzle/Common", "source": { "type": "git", - "url": "https://github.com/guzzle/common.git", + "url": "https://github.com/Guzzle3/common.git", "reference": "2e36af7cf2ce3ea1f2d7c2831843b883a8e7b7dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/common/zipball/2e36af7cf2ce3ea1f2d7c2831843b883a8e7b7dc", + "url": "https://api.github.com/repos/Guzzle3/common/zipball/2e36af7cf2ce3ea1f2d7c2831843b883a8e7b7dc", "reference": "2e36af7cf2ce3ea1f2d7c2831843b883a8e7b7dc", "shasum": "" }, @@ -3367,12 +3245,12 @@ "target-dir": "Guzzle/Http", "source": { "type": "git", - "url": "https://github.com/guzzle/http.git", + "url": "https://github.com/Guzzle3/http.git", "reference": "1e8dd1e2ba9dc42332396f39fbfab950b2301dc5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/http/zipball/1e8dd1e2ba9dc42332396f39fbfab950b2301dc5", + "url": "https://api.github.com/repos/Guzzle3/http/zipball/1e8dd1e2ba9dc42332396f39fbfab950b2301dc5", "reference": "1e8dd1e2ba9dc42332396f39fbfab950b2301dc5", "shasum": "" }, @@ -3424,12 +3302,12 @@ "target-dir": "Guzzle/Parser", "source": { "type": "git", - "url": "https://github.com/guzzle/parser.git", + "url": "https://github.com/Guzzle3/parser.git", "reference": "6874d171318a8e93eb6d224cf85e4678490b625c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/parser/zipball/6874d171318a8e93eb6d224cf85e4678490b625c", + "url": "https://api.github.com/repos/Guzzle3/parser/zipball/6874d171318a8e93eb6d224cf85e4678490b625c", "reference": "6874d171318a8e93eb6d224cf85e4678490b625c", "shasum": "" }, @@ -3468,12 +3346,12 @@ "target-dir": "Guzzle/Stream", "source": { "type": "git", - "url": "https://github.com/guzzle/stream.git", + "url": "https://github.com/Guzzle3/stream.git", "reference": "60c7fed02e98d2c518dae8f97874c8f4622100f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/stream/zipball/60c7fed02e98d2c518dae8f97874c8f4622100f0", + "url": "https://api.github.com/repos/Guzzle3/stream/zipball/60c7fed02e98d2c518dae8f97874c8f4622100f0", "reference": "60c7fed02e98d2c518dae8f97874c8f4622100f0", "shasum": "" }, @@ -3625,6 +3503,77 @@ ], "time": "2013-10-04 15:03:51" }, + { + "name": "kriswallsmith/assetic", + "version": "v1.1.2", + "source": { + "type": "git", + "url": "https://github.com/kriswallsmith/assetic.git", + "reference": "735cffd3982c6e8cdebe292d5db39d077f65890f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/735cffd3982c6e8cdebe292d5db39d077f65890f", + "reference": "735cffd3982c6e8cdebe292d5db39d077f65890f", + "shasum": "" + }, + "require": { + "php": ">=5.3.1", + "symfony/process": "~2.1" + }, + "require-dev": { + "cssmin/cssmin": "*", + "joliclic/javascript-packer": "*", + "kamicane/packager": "*", + "leafo/lessphp": "*", + "leafo/scssphp": "*", + "leafo/scssphp-compass": "*", + "mrclay/minify": "*", + "phpunit/phpunit": "~3.7", + "ptachoire/cssembed": "*", + "twig/twig": "~1.6" + }, + "suggest": { + "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler", + "leafo/scssphp": "Assetic provides the integration with the scssphp SCSS compiler", + "leafo/scssphp-compass": "Assetic provides the integration with the SCSS compass plugin", + "ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris", + "twig/twig": "Assetic provides the integration with the Twig templating engine" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-0": { + "Assetic": "src/" + }, + "files": [ + "src/functions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kris Wallsmith", + "email": "kris.wallsmith@gmail.com", + "homepage": "http://kriswallsmith.net/" + } + ], + "description": "Asset Management for PHP", + "homepage": "https://github.com/kriswallsmith/assetic", + "keywords": [ + "assets", + "compression", + "minification" + ], + "time": "2013-07-19 00:03:27" + }, { "name": "liip/functional-test-bundle", "version": "1.2.1", @@ -3745,12 +3694,12 @@ "version": "1.1.0", "source": { "type": "git", - "url": "https://github.com/moontoast/math.git", + "url": "https://github.com/ramsey/moontoast-math.git", "reference": "fce28a9d1e73e73376cb44e5e581675d15fbe2f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/moontoast/math/zipball/fce28a9d1e73e73376cb44e5e581675d15fbe2f3", + "url": "https://api.github.com/repos/ramsey/moontoast-math/zipball/fce28a9d1e73e73376cb44e5e581675d15fbe2f3", "reference": "fce28a9d1e73e73376cb44e5e581675d15fbe2f3", "shasum": "" }, @@ -3786,7 +3735,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pdepend/pdepend/zipball/5fbe4b9ec9d05057d88b898ac5ba9071f427eeb0", + "url": "https://api.github.com/repos/pdepend/pdepend/zipball/8c5cd9a9e930bf8bc429cdcbf5738f90808816a0", "reference": "5fbe4b9ec9d05057d88b898ac5ba9071f427eeb0", "shasum": "" }, From 64775def9cf45a1080dd3a69b89380a2ecacff19 Mon Sep 17 00:00:00 2001 From: Reinier Kip Date: Wed, 3 Jun 2015 11:18:05 +0200 Subject: [PATCH 2/3] Disable reporting of E_USER_DEPRECATED errors triggered by Symfony. --- app/console | 2 +- app_dev.php.dist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/console b/app/console index 118fee251..ec53685c1 100755 --- a/app/console +++ b/app/console @@ -17,7 +17,7 @@ $debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('- && $env !== 'build'; if ($debug) { - Debug::enable(); + Debug::enable(~E_USER_DEPRECATED); } $kernel = new AppKernel($env, $debug); diff --git a/app_dev.php.dist b/app_dev.php.dist index 6355b73b8..01590cd3a 100644 --- a/app_dev.php.dist +++ b/app_dev.php.dist @@ -4,7 +4,7 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Debug\Debug; $loader = require_once __DIR__.'/../app/bootstrap.php.cache'; -Debug::enable(); +Debug::enable(~E_USER_DEPRECATED); require_once __DIR__.'/../app/AppKernel.php'; From ee3a4a1c43e29f2e6a57d88dc41ea59d72b368eb Mon Sep 17 00:00:00 2001 From: Reinier Kip Date: Wed, 3 Jun 2015 11:18:16 +0200 Subject: [PATCH 3/3] Use service factory syntax introduced in Symfony 2.6. --- .../ApiBundle/Resources/config/projection.yml | 3 +- .../ApiBundle/Resources/config/services.yml | 36 +++++++------------ .../Resources/config/repositories.yml | 10 +++--- .../Resources/config/services.yml | 3 +- 4 files changed, 18 insertions(+), 34 deletions(-) diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/projection.yml b/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/projection.yml index f811ad72b..3f84e8a50 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/projection.yml +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/projection.yml @@ -2,8 +2,7 @@ services: stepup.repository.identifying_data: public: false class: Surfnet\Stepup\IdentifyingData\Entity\IdentifyingDataRepository - factory_service: doctrine.orm.entity_manager - factory_method: getRepository + factory: [@doctrine.orm.entity_manager, getRepository] arguments: - 'Surfnet\Stepup\IdentifyingData\Entity\IdentifyingData' diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/services.yml b/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/services.yml index b0a9dfe61..1fa3c4c8b 100644 --- a/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/services.yml +++ b/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/services.yml @@ -2,74 +2,62 @@ services: # Repositories surfnet_stepup_middleware_api.repository.identity: class: Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\IdentityRepository - factory_service: doctrine.orm.middleware_entity_manager - factory_method: getRepository + factory: [@doctrine.orm.middleware_entity_manager, getRepository] arguments: [ Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Identity ] surfnet_stepup_middleware_api.repository.institution_listing: class: Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\InstitutionListingRepository - factory_service: doctrine.orm.middleware_entity_manager - factory_method: getRepository + factory: [@doctrine.orm.middleware_entity_manager, getRepository] arguments: [ Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\InstitutionListing ] surfnet_stepup_middleware_api.repository.ra: class: Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RaRepository - factory_service: doctrine.orm.middleware_entity_manager - factory_method: getRepository + factory: [@doctrine.orm.middleware_entity_manager, getRepository] arguments: [ Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Ra ] surfnet_stepup_middleware_api.repository.raa: class: Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RaaRepository - factory_service: doctrine.orm.middleware_entity_manager - factory_method: getRepository + factory: [@doctrine.orm.middleware_entity_manager, getRepository] arguments: [ Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Raa ] surfnet_stepup_middleware_api.repository.ra_candidate: class: Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RaCandidateRepository - factory_service: doctrine.orm.middleware_entity_manager - factory_method: getRepository + factory: [@doctrine.orm.middleware_entity_manager, getRepository] arguments: [ Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\RaCandidate ] surfnet_stepup_middleware_api.repository.ra_listing: class: Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RaListingRepository - factory_service: doctrine.orm.middleware_entity_manager - factory_method: getRepository + factory: [@doctrine.orm.middleware_entity_manager, getRepository] arguments: [ Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\RaListing ] surfnet_stepup_middleware_api.repository.sraa: class: Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\SraaRepository - factory_service: doctrine.orm.middleware_entity_manager - factory_method: getRepository + factory: [@doctrine.orm.middleware_entity_manager, getRepository] arguments: [ Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Sraa ] surfnet_stepup_middleware_api.repository.unverified_second_factor: class: Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\UnverifiedSecondFactorRepository - factory_service: doctrine.orm.middleware_entity_manager - factory_method: getRepository + factory: [@doctrine.orm.middleware_entity_manager, getRepository] arguments: [ Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\UnverifiedSecondFactor ] surfnet_stepup_middleware_api.repository.verified_second_factor: class: Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\VerifiedSecondFactorRepository - factory_service: doctrine.orm.middleware_entity_manager - factory_method: getRepository + factory: [@doctrine.orm.middleware_entity_manager, getRepository] arguments: [ Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\VerifiedSecondFactor ] surfnet_stepup_middleware_api.repository.vetted_second_factor: class: Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\VettedSecondFactorRepository - factory_service: doctrine.orm.middleware_entity_manager - factory_method: getRepository + factory: [@doctrine.orm.middleware_entity_manager, getRepository] arguments: [ Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\VettedSecondFactor ] surfnet_stepup_middleware_api.repository.ra_second_factor: class: Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RaSecondFactorRepository - factory_service: doctrine.orm.middleware_entity_manager - factory_method: getRepository + factory: [@doctrine.orm.middleware_entity_manager, getRepository] arguments: [ Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\RaSecondFactor ] surfnet_stepup_middleware_api.repository.audit_log: class: Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\AuditLogRepository - factory_service: doctrine.orm.middleware_entity_manager - factory_method: getRepository + factory: [@doctrine.orm.middleware_entity_manager, getRepository] arguments: [ Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\AuditLogEntry ] # Domain Services diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Resources/config/repositories.yml b/src/Surfnet/StepupMiddleware/GatewayBundle/Resources/config/repositories.yml index d38d47d6e..2cdafe2f6 100644 --- a/src/Surfnet/StepupMiddleware/GatewayBundle/Resources/config/repositories.yml +++ b/src/Surfnet/StepupMiddleware/GatewayBundle/Resources/config/repositories.yml @@ -1,14 +1,12 @@ services: middleware.gateway_repository.saml_entities: - class: Surfnet\StepupMiddleware\GatewayBundle\Entity\SamlEntityRepository - factory_service: doctrine.orm.gateway_entity_manager - factory_method: getRepository + class: Surfnet\StepupMiddleware\GatewayBundle\Entity\SamlEntityRepository + factory: [@doctrine.orm.gateway_entity_manager, getRepository] arguments: - 'Surfnet\StepupMiddleware\GatewayBundle\Entity\SamlEntity' middleware.gateway_repository.second_factors: - class: Surfnet\StepupMiddleware\GatewayBundle\Repository\SecondFactorRepository - factory_service: doctrine.orm.gateway_entity_manager - factory_method: getRepository + class: Surfnet\StepupMiddleware\GatewayBundle\Repository\SecondFactorRepository + factory: [@doctrine.orm.gateway_entity_manager, getRepository] arguments: - 'Surfnet\StepupMiddleware\GatewayBundle\Entity\SecondFactor' diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Resources/config/services.yml b/src/Surfnet/StepupMiddleware/ManagementBundle/Resources/config/services.yml index 126e3261d..686d1d6ed 100644 --- a/src/Surfnet/StepupMiddleware/ManagementBundle/Resources/config/services.yml +++ b/src/Surfnet/StepupMiddleware/ManagementBundle/Resources/config/services.yml @@ -36,8 +36,7 @@ services: surfnet_stepup_middleware_management.repository.email_template: class: Surfnet\StepupMiddleware\ManagementBundle\Configuration\Repository\EmailTemplateRepository - factory_service: doctrine.orm.middleware_entity_manager - factory_method: getRepository + factory: [@doctrine.orm.middleware_entity_manager, getRepository] arguments: [ Surfnet\StepupMiddleware\ManagementBundle\Configuration\Entity\EmailTemplate ] surfnet_stepup_middleware_management.service.email_template: