From 95257817bd599d10d9a97802511fec21f302d30f Mon Sep 17 00:00:00 2001 From: Bruno Vitorino Date: Fri, 21 Apr 2017 15:46:09 +0200 Subject: [PATCH 1/5] Add bundle to composer and to AppKernel. --- app/AppKernel.php | 1 + composer.json | 3 +- composer.lock | 196 +++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 186 insertions(+), 14 deletions(-) diff --git a/app/AppKernel.php b/app/AppKernel.php index 93410bb..115db88 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -25,6 +25,7 @@ public function registerBundles() new Knp\Bundle\PaginatorBundle\KnpPaginatorBundle(), new Knp\Bundle\MenuBundle\KnpMenuBundle(), new Eo\AirbrakeBundle\EoAirbrakeBundle(), + new SimpleBus\SymfonyBridge\SimpleBusCommandBusBundle(), new SumoCoders\FrameworkCoreBundle\SumoCodersFrameworkCoreBundle(), new SumoCoders\FrameworkSearchBundle\SumoCodersFrameworkSearchBundle(), diff --git a/composer.json b/composer.json index c0d27ac..b0cd434 100644 --- a/composer.json +++ b/composer.json @@ -40,7 +40,8 @@ "sumocoders/framework-search-bundle": "^3.0", "sumocoders/framework-example-bundle": "^4.0", "sumocoders/framework-multi-user-bundle": "^4.0", - "knplabs/knp-paginator-bundle": "^2.5" + "knplabs/knp-paginator-bundle": "^2.5", + "simple-bus/symfony-bridge": "^4.1" }, "require-dev": { "composer/composer": "1.0.*@dev", diff --git a/composer.lock b/composer.lock index dc008bb..97ac29d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,63 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "aba8ff3ede76aca01290386d11634058", + "content-hash": "53f4588cff51ff9298534b27cb072ee9", "packages": [ + { + "name": "beberlei/assert", + "version": "v2.7.4", + "source": { + "type": "git", + "url": "https://github.com/beberlei/assert.git", + "reference": "3ee3bc468a3ce4bbfc3d74f53c6cdb5242d39d1a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/beberlei/assert/zipball/3ee3bc468a3ce4bbfc3d74f53c6cdb5242d39d1a", + "reference": "3ee3bc468a3ce4bbfc3d74f53c6cdb5242d39d1a", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "php": ">=5.3" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.1.1", + "phpunit/phpunit": "^4|^5" + }, + "type": "library", + "autoload": { + "psr-4": { + "Assert\\": "lib/Assert" + }, + "files": [ + "lib/Assert/functions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de", + "role": "Lead Developer" + }, + { + "name": "Richard Quadling", + "email": "rquadling@gmail.com", + "role": "Collaborator" + } + ], + "description": "Thin assertion library for input validation in business models.", + "keywords": [ + "assert", + "assertion", + "validation" + ], + "time": "2017-03-14T18:06:52+00:00" + }, { "name": "dbtlr/php-airbrake", "version": "1.1.4", @@ -961,17 +1016,17 @@ "source": { "type": "git", "url": "https://github.com/eymengunay/EoAirbrakeBundle.git", - "reference": "2533069dca7ae359a2de6d495aec8b64f07d2cee" + "reference": "efbd8ddceaa5e949e51d9bde25fd42d997663fbe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/eymengunay/EoAirbrakeBundle/zipball/2533069dca7ae359a2de6d495aec8b64f07d2cee", - "reference": "2533069dca7ae359a2de6d495aec8b64f07d2cee", + "url": "https://api.github.com/repos/eymengunay/EoAirbrakeBundle/zipball/efbd8ddceaa5e949e51d9bde25fd42d997663fbe", + "reference": "efbd8ddceaa5e949e51d9bde25fd42d997663fbe", "shasum": "" }, "require": { "dbtlr/php-airbrake": "~1.1", - "symfony/symfony": "~2.1" + "symfony/symfony": "^2.7 || ^3.0" }, "type": "symfony-bundle", "extra": { @@ -994,13 +1049,13 @@ "email": "eymen@egunay.com" } ], - "description": "Airbrake.io integration for Symfony2", + "description": "Airbrake.io integration for Symfony", "keywords": [ "airbrake", "errbit", "exception" ], - "time": "2016-02-02 11:43:50" + "time": "2017-01-18 13:16:01" }, { "name": "incenteev/composer-parameter-handler", @@ -1542,7 +1597,7 @@ ], "authors": [ { - "name": "KNPLabs Team", + "name": "KnpLabs Team", "homepage": "http://knplabs.com" }, { @@ -1724,7 +1779,7 @@ ], "authors": [ { - "name": "KNPLabs Team", + "name": "KnpLabs Team", "homepage": "http://knplabs.com" }, { @@ -2292,6 +2347,120 @@ "description": "A security checker for your composer.lock", "time": "2015-11-07T08:07:40+00:00" }, + { + "name": "simple-bus/message-bus", + "version": "v2.2.2", + "source": { + "type": "git", + "url": "https://github.com/SimpleBus/MessageBus.git", + "reference": "723bf20b93e17e9e87e83032ec21d8b2452328cf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/SimpleBus/MessageBus/zipball/723bf20b93e17e9e87e83032ec21d8b2452328cf", + "reference": "723bf20b93e17e9e87e83032ec21d8b2452328cf", + "shasum": "" + }, + "require": { + "beberlei/assert": "~2.0", + "php": ">=5.4", + "psr/log": "~1.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "~0.6" + }, + "type": "library", + "autoload": { + "psr-4": { + "SimpleBus\\Message\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Matthias Noback", + "email": "matthiasnoback@gmail.com", + "homepage": "http://php-and-symfony.matthiasnoback.nl" + } + ], + "description": "Generic classes and interfaces for messages and message buses", + "homepage": "http://github.com/SimpleBus/MessageBus", + "keywords": [ + "command bus", + "event bus", + "message", + "message bus" + ], + "time": "2016-02-12T08:35:53+00:00" + }, + { + "name": "simple-bus/symfony-bridge", + "version": "v4.1.5", + "source": { + "type": "git", + "url": "https://github.com/SimpleBus/SymfonyBridge.git", + "reference": "2033629f89b57f817cdc944b043180522dba1c9f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/SimpleBus/SymfonyBridge/zipball/2033629f89b57f817cdc944b043180522dba1c9f", + "reference": "2033629f89b57f817cdc944b043180522dba1c9f", + "shasum": "" + }, + "require": { + "php": ">=5.4", + "simple-bus/message-bus": "~2.0", + "symfony/config": "~2.3|~3.0", + "symfony/dependency-injection": "~2.3|~3.0", + "symfony/http-kernel": "~2.3|~3.0", + "symfony/yaml": "~2.3|~3.0" + }, + "require-dev": { + "doctrine/doctrine-bundle": "~1.0", + "doctrine/orm": "~2.3", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "~0.6", + "simple-bus/doctrine-orm-bridge": "~4.0", + "symfony/monolog-bridge": "~2.3|~3.0", + "symfony/monolog-bundle": "~2.3|~3.0" + }, + "suggest": { + "doctrine/doctrine-bundle": "For integration with Doctrine ORM", + "doctrine/orm": "For integration with Doctrine ORM", + "simple-bus/doctrine-orm-bridge": "For integration with Doctrine ORM", + "symfony/monolog-bundle": "For logging messages" + }, + "type": "library", + "autoload": { + "psr-4": { + "SimpleBus\\SymfonyBridge\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Matthias Noback", + "email": "matthiasnoback@gmail.com", + "homepage": "http://php-and-symfony.matthiasnoback.nl" + } + ], + "description": "Bridge for using command buses and event buses in Symfony projects", + "homepage": "http://github.com/SimpleBus/SymfonyBridge", + "keywords": [ + "command bus", + "doctrine", + "event bus", + "symfony" + ], + "time": "2016-07-17T12:50:07+00:00" + }, { "name": "sumocoders/framework-error-bundle", "version": "v3.0.0", @@ -3333,15 +3502,16 @@ "source": { "type": "git", "url": "https://github.com/tijsverkoyen/CssToInlineStyles.git", - "reference": "bb535b05ba1e23a0400ecc73adaa00d37289baf1" + "reference": "9b646cf9ed4301d423d3c817f810957467c8ce61" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/bb535b05ba1e23a0400ecc73adaa00d37289baf1", - "reference": "bb535b05ba1e23a0400ecc73adaa00d37289baf1", + "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/9b646cf9ed4301d423d3c817f810957467c8ce61", + "reference": "9b646cf9ed4301d423d3c817f810957467c8ce61", "shasum": "" }, "require": { + "php": "^5.5 || ^7", "symfony/css-selector": "^2.7|~3.0" }, "require-dev": { @@ -3371,7 +3541,7 @@ ], "description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.", "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles", - "time": "2016-02-23 13:27:47" + "time": "2016-11-08 13:27:18" }, { "name": "twig/extensions", From d4ef5aead31760c664987de48f2b27194bfbbb9c Mon Sep 17 00:00:00 2001 From: Bruno Vitorino Date: Sat, 22 Apr 2017 23:17:03 +0200 Subject: [PATCH 2/5] Fix expected value of test. --- .../FrameworkCoreBundle/Tests/Mail/MessageFactoryTest.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/SumoCoders/FrameworkCoreBundle/Tests/Mail/MessageFactoryTest.php b/src/SumoCoders/FrameworkCoreBundle/Tests/Mail/MessageFactoryTest.php index f312bd9..2918b78 100644 --- a/src/SumoCoders/FrameworkCoreBundle/Tests/Mail/MessageFactoryTest.php +++ b/src/SumoCoders/FrameworkCoreBundle/Tests/Mail/MessageFactoryTest.php @@ -91,12 +91,9 @@ public function testCreationOfHtmlMessageWithAutomaticPlainText() $expectedResult = << - - -

And I, le content

- + +

And I, le content

- EOF; $message = $this->messageFactory->createHtmlMessage( From 0a9e549b6de49b373ab63977d407a53a6ae7c89e Mon Sep 17 00:00:00 2001 From: Bruno Vitorino Date: Thu, 18 May 2017 17:49:11 +0200 Subject: [PATCH 3/5] Add DoctrineOrmBridge bundle to AppKernel. --- app/AppKernel.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/AppKernel.php b/app/AppKernel.php index 115db88..988f30c 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -25,6 +25,7 @@ public function registerBundles() new Knp\Bundle\PaginatorBundle\KnpPaginatorBundle(), new Knp\Bundle\MenuBundle\KnpMenuBundle(), new Eo\AirbrakeBundle\EoAirbrakeBundle(), + new SimpleBus\SymfonyBridge\DoctrineOrmBridgeBundle(), new SimpleBus\SymfonyBridge\SimpleBusCommandBusBundle(), new SumoCoders\FrameworkCoreBundle\SumoCodersFrameworkCoreBundle(), From 0aae23edffc3d422a1be9ad6c73339d8763e654e Mon Sep 17 00:00:00 2001 From: Bruno Vitorino Date: Thu, 18 May 2017 17:54:31 +0200 Subject: [PATCH 4/5] Add SimpleBusEventBusBundle. This is a dependency of the DoctrineOrmBundle. --- app/AppKernel.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/AppKernel.php b/app/AppKernel.php index 988f30c..c1d2336 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -27,6 +27,7 @@ public function registerBundles() new Eo\AirbrakeBundle\EoAirbrakeBundle(), new SimpleBus\SymfonyBridge\DoctrineOrmBridgeBundle(), new SimpleBus\SymfonyBridge\SimpleBusCommandBusBundle(), + new SimpleBus\SymfonyBridge\SimpleBusEventBusBundle(), new SumoCoders\FrameworkCoreBundle\SumoCodersFrameworkCoreBundle(), new SumoCoders\FrameworkSearchBundle\SumoCodersFrameworkSearchBundle(), From 1e5a8786df3c45a0f4a831faeec0644708d05581 Mon Sep 17 00:00:00 2001 From: Bruno Vitorino Date: Fri, 19 May 2017 08:49:45 +0200 Subject: [PATCH 5/5] Also add doctrine-orm-bridge dependency. This seams to also be required. --- composer.json | 3 ++- composer.lock | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index b0cd434..63db73c 100644 --- a/composer.json +++ b/composer.json @@ -41,7 +41,8 @@ "sumocoders/framework-example-bundle": "^4.0", "sumocoders/framework-multi-user-bundle": "^4.0", "knplabs/knp-paginator-bundle": "^2.5", - "simple-bus/symfony-bridge": "^4.1" + "simple-bus/symfony-bridge": "^4.1", + "simple-bus/doctrine-orm-bridge": "^4.0" }, "require-dev": { "composer/composer": "1.0.*@dev", diff --git a/composer.lock b/composer.lock index 97ac29d..57db5e4 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "53f4588cff51ff9298534b27cb072ee9", + "content-hash": "8d941cccfd1cf59b2d4f9bb0e664e2be", "packages": [ { "name": "beberlei/assert", @@ -2347,6 +2347,60 @@ "description": "A security checker for your composer.lock", "time": "2015-11-07T08:07:40+00:00" }, + { + "name": "simple-bus/doctrine-orm-bridge", + "version": "v4.0.0", + "source": { + "type": "git", + "url": "https://github.com/SimpleBus/DoctrineORMBridge.git", + "reference": "46df998f26940d9525f8e35c40641328c679dbfe" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/SimpleBus/DoctrineORMBridge/zipball/46df998f26940d9525f8e35c40641328c679dbfe", + "reference": "46df998f26940d9525f8e35c40641328c679dbfe", + "shasum": "" + }, + "require": { + "beberlei/assert": "~2.0", + "doctrine/orm": "~2.2", + "php": ">=5.4", + "simple-bus/message-bus": "~2.0" + }, + "require-dev": { + "matthiasnoback/doctrine-orm-test-service-provider": "~2.0", + "phpunit/phpunit": "~4.5", + "satooshi/php-coveralls": "~0.6" + }, + "suggest": { + "simple-bus/symfony-bridge": "Bridge for using command buses and event buses with Symfony" + }, + "type": "library", + "autoload": { + "psr-4": { + "SimpleBus\\DoctrineORMBridge\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Matthias Noback", + "email": "matthiasnoback@gmail.com", + "homepage": "http://php-and-symfony.matthiasnoback.nl" + } + ], + "description": "Doctrine ORM bridge for using command and event buses", + "homepage": "http://github.com/SimpleBus/DoctrineORMBridge", + "keywords": [ + "command bus", + "doctrine", + "event bus" + ], + "time": "2015-04-29T12:27:27+00:00" + }, { "name": "simple-bus/message-bus", "version": "v2.2.2",