From e5d817ac6ce977e7b8ebf98ed77bab8386eb3728 Mon Sep 17 00:00:00 2001 From: WouterJ Date: Wed, 1 Jun 2016 21:45:01 +0200 Subject: [PATCH] Remove temporary SonataAdminBundle fork --- composer.json | 8 +---- composer.lock | 85 +++++++++++++++++++++++---------------------------- 2 files changed, 40 insertions(+), 53 deletions(-) diff --git a/composer.json b/composer.json index 90414b06..2b6328fb 100644 --- a/composer.json +++ b/composer.json @@ -16,12 +16,6 @@ "autoload-dev": { "classmap": [ "app/tests/WebTestCase.php" ] }, - "repositories": [ - { - "type": "vcs", - "url": "https://github.com/WouterJ/SonataAdminBundle.git" - } - ], "require": { "php": "^5.5.9|^7.0", "symfony/symfony": "^3.0", @@ -45,7 +39,7 @@ "sonata-project/cache-bundle": "^2.1", "sonata-project/doctrine-phpcr-admin-bundle": "^2.0", - "sonata-project/admin-bundle": "dev-fix-bug-admin-groups as 3.1.0", + "sonata-project/admin-bundle": "^3.2", "sonata-project/translation-bundle": "^2.0", "jms/serializer-bundle": "^1.1", diff --git a/composer.lock b/composer.lock index e8973b1c..ec54688f 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": "f3f8c852616f5966a59213e3ef4ac0bc", - "content-hash": "d3e37079e607080ba2d277679c9c3f39", + "hash": "f443c7ccdd6ae4345c3a86029ac594ed", + "content-hash": "e3daedc9bc23b5f15021693ff9d6f71b", "packages": [ { "name": "aferrandini/urlizer", @@ -2825,16 +2825,16 @@ }, { "name": "sonata-project/admin-bundle", - "version": "dev-fix-bug-admin-groups", + "version": "3.x-dev", "source": { "type": "git", - "url": "https://github.com/WouterJ/SonataAdminBundle.git", - "reference": "773a0b06693ce6fc09b76c694f6c1869b7328659" + "url": "https://github.com/sonata-project/SonataAdminBundle.git", + "reference": "c7e103c45b9c62dd545d0076ba41576dc7f2971b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WouterJ/SonataAdminBundle/zipball/773a0b06693ce6fc09b76c694f6c1869b7328659", - "reference": "773a0b06693ce6fc09b76c694f6c1869b7328659", + "url": "https://api.github.com/repos/sonata-project/SonataAdminBundle/zipball/c7e103c45b9c62dd545d0076ba41576dc7f2971b", + "reference": "c7e103c45b9c62dd545d0076ba41576dc7f2971b", "shasum": "" }, "require": { @@ -2892,18 +2892,19 @@ "Sonata\\AdminBundle\\": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ + { + "name": "Sonata Community", + "homepage": "https://github.com/sonata-project/SonataAdminBundle/contributors" + }, { "name": "Thomas Rabaix", "email": "thomas.rabaix@sonata-project.org", "homepage": "https://sonata-project.org" - }, - { - "name": "Sonata Community", - "homepage": "https://github.com/sonata-project/SonataAdminBundle/contributors" } ], "description": "The missing Symfony Admin Generator", @@ -2914,10 +2915,7 @@ "bootstrap", "sonata" ], - "support": { - "source": "https://github.com/WouterJ/SonataAdminBundle/tree/fix-bug-admin-groups" - }, - "time": "2016-06-01 12:01:28" + "time": "2016-06-01 13:42:19" }, { "name": "sonata-project/block-bundle", @@ -3123,20 +3121,21 @@ }, { "name": "sonata-project/core-bundle", - "version": "3.0.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/sonata-project/SonataCoreBundle.git", - "reference": "bf2b5bb35b0bf12e1987d3255688915ce1e9a686" + "reference": "66e9d21f9b38cce824e3c43adf39b3f08b062505" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sonata-project/SonataCoreBundle/zipball/bf2b5bb35b0bf12e1987d3255688915ce1e9a686", - "reference": "bf2b5bb35b0bf12e1987d3255688915ce1e9a686", + "url": "https://api.github.com/repos/sonata-project/SonataCoreBundle/zipball/66e9d21f9b38cce824e3c43adf39b3f08b062505", + "reference": "66e9d21f9b38cce824e3c43adf39b3f08b062505", "shasum": "" }, "require": { "cocur/slugify": "^1.4 || ^2.0", + "php": "^5.3 || ^7.0", "symfony/config": "^2.3 || ^3.0", "symfony/form": "^2.3 || ^3.0", "symfony/http-foundation": "^2.3 || ^3.0", @@ -3150,9 +3149,9 @@ "doctrine/phpcr-odm": "^1.0", "friendsofsymfony/rest-bundle": "^1.1 || ^2.0", "jackalope/jackalope-doctrine-dbal": "^1.0", - "jms/serializer-bundle": "~0.11 || ^1.0", - "matthiasnoback/symfony-config-test": "~0.4 || ^1.0", - "matthiasnoback/symfony-dependency-injection-test": "~0.7", + "jms/serializer-bundle": "0.11 - 0.13 || ^1.0", + "matthiasnoback/symfony-config-test": "^0.4 || ^1.0", + "matthiasnoback/symfony-dependency-injection-test": "^0.7", "sensio/framework-extra-bundle": "^2.3 || ^3.0", "sllh/php-cs-fixer-styleci-bridge": "^2.0", "sonata-project/exporter": "^1.3", @@ -3188,7 +3187,7 @@ "keywords": [ "sonata" ], - "time": "2016-05-06 10:59:25" + "time": "2016-06-01 12:33:04" }, { "name": "sonata-project/doctrine-phpcr-admin-bundle", @@ -3714,12 +3713,12 @@ "source": { "type": "git", "url": "https://github.com/symfony-cmf/menu-bundle.git", - "reference": "c605b260a2ef58199b8bf3c353ba8006019724fc" + "reference": "7de2847a2d8c208c6def661a28ad631875de17e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/menu-bundle/zipball/c605b260a2ef58199b8bf3c353ba8006019724fc", - "reference": "c605b260a2ef58199b8bf3c353ba8006019724fc", + "url": "https://api.github.com/repos/symfony-cmf/menu-bundle/zipball/7de2847a2d8c208c6def661a28ad631875de17e3", + "reference": "7de2847a2d8c208c6def661a28ad631875de17e3", "shasum": "" }, "require": { @@ -3772,7 +3771,7 @@ "Symfony CMF", "menu" ], - "time": "2016-05-23 07:36:58" + "time": "2016-06-01 15:27:14" }, { "name": "symfony-cmf/resource", @@ -5672,27 +5671,30 @@ }, { "name": "zendframework/zend-servicemanager", - "version": "3.0.3", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-servicemanager.git", - "reference": "654eaec084d053c832beca10a53af078afca423e" + "reference": "90b88339a4b937c6bb0055ee04b2567e7e628f25" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/654eaec084d053c832beca10a53af078afca423e", - "reference": "654eaec084d053c832beca10a53af078afca423e", + "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/90b88339a4b937c6bb0055ee04b2567e7e628f25", + "reference": "90b88339a4b937c6bb0055ee04b2567e7e628f25", "shasum": "" }, "require": { "container-interop/container-interop": "~1.0", "php": "^5.5 || ^7.0" }, + "provide": { + "container-interop/container-interop-implementation": "^1.1" + }, "require-dev": { - "ocramius/proxy-manager": "~1.0", + "ocramius/proxy-manager": "^1.0 || ^2.0", "phpbench/phpbench": "^0.10.0", - "phpunit/phpunit": "~4.6", - "squizlabs/php_codesniffer": "^2.0@dev" + "phpunit/phpunit": "^4.6 || ^5.2.10", + "squizlabs/php_codesniffer": "^2.5.1" }, "suggest": { "ocramius/proxy-manager": "ProxyManager 1.* to handle lazy initialization of services", @@ -5720,7 +5722,7 @@ "servicemanager", "zf" ], - "time": "2016-02-02 14:13:42" + "time": "2016-06-01 16:50:58" }, { "name": "zendframework/zend-stdlib", @@ -6180,18 +6182,9 @@ "time": "2016-04-12 18:27:47" } ], - "aliases": [ - { - "alias": "3.1.0", - "alias_normalized": "3.1.0.0", - "version": "dev-fix-bug-admin-groups", - "package": "sonata-project/admin-bundle" - } - ], + "aliases": [], "minimum-stability": "dev", - "stability-flags": { - "sonata-project/admin-bundle": 20 - }, + "stability-flags": [], "prefer-stable": true, "prefer-lowest": false, "platform": {