From 9bf9dba0be9743ed1ab494dbd8df331514d35485 Mon Sep 17 00:00:00 2001 From: Connor Graham Date: Sun, 5 May 2019 18:13:45 +0100 Subject: [PATCH 01/17] WIP: making the controller use service configuration need to: delete the yaml file figure out why dep msg still appearing after explicit configuration --- .gitignore | 1 + Controller/MessageController.php | 119 +++++++++++++++----- DependencyInjection/FOSMessageExtension.php | 1 + Resources/config/services.xml | 51 +++++++++ Resources/config/services.yaml | 16 +++ 5 files changed, 157 insertions(+), 31 deletions(-) create mode 100644 Resources/config/services.xml create mode 100644 Resources/config/services.yaml diff --git a/.gitignore b/.gitignore index b721bc7d..da76324f 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ vendor .php_cs Tests/Functional/cache Tests/Functional/logs +var \ No newline at end of file diff --git a/Controller/MessageController.php b/Controller/MessageController.php index edb6de97..596d892c 100644 --- a/Controller/MessageController.php +++ b/Controller/MessageController.php @@ -3,18 +3,83 @@ namespace FOS\MessageBundle\Controller; use FOS\MessageBundle\Provider\ProviderInterface; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; -use Symfony\Component\DependencyInjection\ContainerAwareInterface; -use Symfony\Component\DependencyInjection\ContainerInterface; +use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Response; -class MessageController extends Controller implements ContainerAwareInterface +//Dependency Injection +use Symfony\Component\Routing\RouterInterface; + +use FOS\MessageBundle\FormFactory\ReplyMessageFormFactory; +use FOS\MessageBundle\FormHandler\ReplyMessageFormHandler; + +use FOS\MessageBundle\FormFactory\NewThreadMessageFormFactory; +use FOS\MessageBundle\FormHandler\NewThreadMessageFormHandler; + +use FOS\MessageBundle\Deleter\Deleter; +use FOS\MessageBundle\EntityManager\ThreadManager; + +use FOS\MessageBundle\Search\QueryFactory; +use FOS\MessageBundle\Search\Finder; + +use FOS\MessageBundle\Provider\Provider; + + +// service names + +// fos_message.reply_form.factory +// fos_message.reply_form.handler + +// router + +// fos_message.new_thread_form.factory +// fos_message.new_thread_form.handler + +// fos_message.deleter +// fos_message.thread_manager + +// fos_message.search_query_factory +// fos_message.search_finder + +// fos_message.provider + +class MessageController extends AbstractController { - /** - * @var ContainerInterface - */ - protected $container; + protected $router; + protected $replyFormFactory; + protected $replyFormHandler; + protected $newThreadFormFactory; + protected $newThreadFormHandler; + protected $deleter; + protected $threadManager; + protected $searchQueryFactory; + protected $searchFinder; + protected $provider; + + public function __construct( + $router, + $replyFormFactory, + $replyFormHandler, + $newThreadFormFactory, + $newThreadFormHandler, + $deleter, + $threadManager, + $searchQueryFactory, + $searchFinder, + $provider + ) + { + $this->router = $router; + $this->replyFormFactory = $replyFormFactory; + $this->replyFormHandler = $replyFormHandler; + $this->newThreadFormFactory = $newThreadFormFactory; + $this->newThreadFormHandler = $newThreadFormHandler; + $this->deleter = $deleter; + $this->threadManager = $threadManager; + $this->searchQueryFactory = $searchQueryFactory; + $this->searchFinder = $searchFinder; + $this->provider = $provider; + } /** * Displays the authenticated participant inbox. @@ -68,11 +133,11 @@ public function deletedAction() public function threadAction($threadId) { $thread = $this->getProvider()->getThread($threadId); - $form = $this->container->get('fos_message.reply_form.factory')->create($thread); - $formHandler = $this->container->get('fos_message.reply_form.handler'); + $form = $this->replyFormFactory->create($thread); + $formHandler = $this->replyFormHandler; if ($message = $formHandler->process($form)) { - return new RedirectResponse($this->container->get('router')->generate('fos_message_thread_view', array( + return new RedirectResponse($this->router->generate('fos_message_thread_view', array( 'threadId' => $message->getThread()->getId(), ))); } @@ -90,11 +155,11 @@ public function threadAction($threadId) */ public function newThreadAction() { - $form = $this->container->get('fos_message.new_thread_form.factory')->create(); - $formHandler = $this->container->get('fos_message.new_thread_form.handler'); + $form = $this->newThreadFormFactory->create(); + $formHandler = $this->newThreadFormHandler->get('fos_message.new_thread_form.handler'); if ($message = $formHandler->process($form)) { - return new RedirectResponse($this->container->get('router')->generate('fos_message_thread_view', array( + return new RedirectResponse($this->router->generate('fos_message_thread_view', array( 'threadId' => $message->getThread()->getId(), ))); } @@ -115,10 +180,10 @@ public function newThreadAction() public function deleteAction($threadId) { $thread = $this->getProvider()->getThread($threadId); - $this->container->get('fos_message.deleter')->markAsDeleted($thread); - $this->container->get('fos_message.thread_manager')->saveThread($thread); + $this->deleter->markAsDeleted($thread); + $this->threadManager->saveThread($thread); - return new RedirectResponse($this->container->get('router')->generate('fos_message_inbox')); + return new RedirectResponse($this->router->generate('fos_message_inbox')); } /** @@ -131,10 +196,10 @@ public function deleteAction($threadId) public function undeleteAction($threadId) { $thread = $this->getProvider()->getThread($threadId); - $this->container->get('fos_message.deleter')->markAsUndeleted($thread); - $this->container->get('fos_message.thread_manager')->saveThread($thread); + $this->deleter->markAsUndeleted($thread); + $this->threadManager->saveThread($thread); - return new RedirectResponse($this->container->get('router')->generate('fos_message_inbox')); + return new RedirectResponse($this->router->generate('fos_message_inbox')); } /** @@ -144,8 +209,8 @@ public function undeleteAction($threadId) */ public function searchAction() { - $query = $this->container->get('fos_message.search_query_factory')->createFromRequest(); - $threads = $this->container->get('fos_message.search_finder')->find($query); + $query = $this->searchQueryFactory->createFromRequest(); + $threads = $this->searchFinder->find($query); return $this->render('@FOSMessage/Message/search.html.twig', array( 'query' => $query, @@ -160,14 +225,6 @@ public function searchAction() */ protected function getProvider() { - return $this->container->get('fos_message.provider'); - } - - /** - * {@inheritdoc} - */ - public function setContainer(ContainerInterface $container = null) - { - $this->container = $container; + return $this->provider; } } diff --git a/DependencyInjection/FOSMessageExtension.php b/DependencyInjection/FOSMessageExtension.php index 169f3b82..2dc5c579 100644 --- a/DependencyInjection/FOSMessageExtension.php +++ b/DependencyInjection/FOSMessageExtension.php @@ -30,6 +30,7 @@ public function load(array $configs, ContainerBuilder $container) $loader->load('form.xml'); $loader->load('validator.xml'); $loader->load('spam_detection.xml'); + $loader->load('services.xml'); $container->setParameter('fos_message.message_class', $config['message_class']); $container->setParameter('fos_message.thread_class', $config['thread_class']); diff --git a/Resources/config/services.xml b/Resources/config/services.xml new file mode 100644 index 00000000..35483ef7 --- /dev/null +++ b/Resources/config/services.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Resources/config/services.yaml b/Resources/config/services.yaml new file mode 100644 index 00000000..ee3a4d24 --- /dev/null +++ b/Resources/config/services.yaml @@ -0,0 +1,16 @@ +parameters: + +services: + FOS\MessageBundle\Controller\MessageController: + public: true + bind: + $router: '@router' + $replyFormFactory: '@fos_message.reply_form.factory' + $replyFormHandler: '@fos_message.reply_form.handler' + $newThreadFormFactory: '@fos_message.new_thread_form.factory' + $newThreadFormHandler: '@fos_message.new_thread_form.handler' + $deleter: '@fos_message.deleter' + $threadManager: '@fos_message.thread_manager' + $searchQueryFactory: '@fos_message.search_query_factory' + $searchFinder: '@fos_message.search_finder' + $provider: '@fos_message.provider' \ No newline at end of file From 4b88a1622a6a059a8307d610928ebfafbdc535a7 Mon Sep 17 00:00:00 2001 From: Connor Graham Date: Sun, 5 May 2019 18:23:22 +0100 Subject: [PATCH 02/17] WIP moved controller across to service id --- DependencyInjection/FOSMessageExtension.php | 1 - Resources/config/config.xml | 43 +++++++++++++++++ Resources/config/routing.xml | 16 +++---- Resources/config/services.xml | 51 --------------------- Resources/config/services.yaml | 16 ------- 5 files changed, 51 insertions(+), 76 deletions(-) delete mode 100644 Resources/config/services.xml delete mode 100644 Resources/config/services.yaml diff --git a/DependencyInjection/FOSMessageExtension.php b/DependencyInjection/FOSMessageExtension.php index 2dc5c579..169f3b82 100644 --- a/DependencyInjection/FOSMessageExtension.php +++ b/DependencyInjection/FOSMessageExtension.php @@ -30,7 +30,6 @@ public function load(array $configs, ContainerBuilder $container) $loader->load('form.xml'); $loader->load('validator.xml'); $loader->load('spam_detection.xml'); - $loader->load('services.xml'); $container->setParameter('fos_message.message_class', $config['message_class']); $container->setParameter('fos_message.thread_class', $config['thread_class']); diff --git a/Resources/config/config.xml b/Resources/config/config.xml index 8734dd5a..b8e5f4c8 100644 --- a/Resources/config/config.xml +++ b/Resources/config/config.xml @@ -6,6 +6,49 @@ + + + + + + + + + + + + + diff --git a/Resources/config/routing.xml b/Resources/config/routing.xml index cdf72eb7..56d37479 100644 --- a/Resources/config/routing.xml +++ b/Resources/config/routing.xml @@ -5,35 +5,35 @@ xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd"> - FOS\MessageBundle\Controller\MessageController::inboxAction + fos_message.message_controller::inboxAction - FOS\MessageBundle\Controller\MessageController::sentAction + fos_message.message_controller::sentAction - FOS\MessageBundle\Controller\MessageController::deletedAction + fos_message.message_controller::deletedAction - FOS\MessageBundle\Controller\MessageController::searchAction + fos_message.message_controller::searchAction - FOS\MessageBundle\Controller\MessageController::newThreadAction + fos_message.message_controller::newThreadAction - FOS\MessageBundle\Controller\MessageController::deleteAction + fos_message.message_controller::deleteAction - FOS\MessageBundle\Controller\MessageController::undeleteAction + fos_message.message_controller::undeleteAction - FOS\MessageBundle\Controller\MessageController::threadAction + fos_message.message_controller::threadAction diff --git a/Resources/config/services.xml b/Resources/config/services.xml deleted file mode 100644 index 35483ef7..00000000 --- a/Resources/config/services.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Resources/config/services.yaml b/Resources/config/services.yaml deleted file mode 100644 index ee3a4d24..00000000 --- a/Resources/config/services.yaml +++ /dev/null @@ -1,16 +0,0 @@ -parameters: - -services: - FOS\MessageBundle\Controller\MessageController: - public: true - bind: - $router: '@router' - $replyFormFactory: '@fos_message.reply_form.factory' - $replyFormHandler: '@fos_message.reply_form.handler' - $newThreadFormFactory: '@fos_message.new_thread_form.factory' - $newThreadFormHandler: '@fos_message.new_thread_form.handler' - $deleter: '@fos_message.deleter' - $threadManager: '@fos_message.thread_manager' - $searchQueryFactory: '@fos_message.search_query_factory' - $searchFinder: '@fos_message.search_finder' - $provider: '@fos_message.provider' \ No newline at end of file From 542354fe037a9430f8d8e2e2d0656a6dfe2cf0de Mon Sep 17 00:00:00 2001 From: Connor Graham Date: Sun, 5 May 2019 19:37:10 +0100 Subject: [PATCH 03/17] WIP figured out how to inject service container probably need to remove all other service injection --- Controller/MessageController.php | 4 +++- Resources/config/config.xml | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Controller/MessageController.php b/Controller/MessageController.php index 596d892c..ca9fed6f 100644 --- a/Controller/MessageController.php +++ b/Controller/MessageController.php @@ -57,6 +57,7 @@ class MessageController extends AbstractController protected $provider; public function __construct( + $container, $router, $replyFormFactory, $replyFormHandler, @@ -79,6 +80,7 @@ public function __construct( $this->searchQueryFactory = $searchQueryFactory; $this->searchFinder = $searchFinder; $this->provider = $provider; + $this->setContainer($container); } /** @@ -156,7 +158,7 @@ public function threadAction($threadId) public function newThreadAction() { $form = $this->newThreadFormFactory->create(); - $formHandler = $this->newThreadFormHandler->get('fos_message.new_thread_form.handler'); + $formHandler = $this->newThreadFormHandler; if ($message = $formHandler->process($form)) { return new RedirectResponse($this->router->generate('fos_message_thread_view', array( diff --git a/Resources/config/config.xml b/Resources/config/config.xml index b8e5f4c8..30cd3e33 100644 --- a/Resources/config/config.xml +++ b/Resources/config/config.xml @@ -7,6 +7,10 @@ + Date: Sun, 5 May 2019 20:08:01 +0100 Subject: [PATCH 04/17] WIP fixed TreeBuilder root node complaint --- DependencyInjection/Configuration.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index 1b2d8899..608c2436 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -17,7 +17,7 @@ class Configuration implements ConfigurationInterface */ public function getConfigTreeBuilder() { - $treeBuilder = new TreeBuilder(); + $treeBuilder = new TreeBuilder('fos_message'); $rootNode = $treeBuilder->root('fos_message'); $rootNode From 79e0e45c3141de1f805638ff91bbb0951409b470 Mon Sep 17 00:00:00 2001 From: Connor Graham Date: Sun, 5 May 2019 20:14:30 +0100 Subject: [PATCH 05/17] moved controller back to be closer to the original implementation, removed awareinterface and injected container --- Controller/MessageController.php | 107 +++++++------------------------ Resources/config/config.xml | 40 ------------ 2 files changed, 22 insertions(+), 125 deletions(-) diff --git a/Controller/MessageController.php b/Controller/MessageController.php index ca9fed6f..9fdcfbbc 100644 --- a/Controller/MessageController.php +++ b/Controller/MessageController.php @@ -6,83 +6,20 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Response; - -//Dependency Injection -use Symfony\Component\Routing\RouterInterface; - -use FOS\MessageBundle\FormFactory\ReplyMessageFormFactory; -use FOS\MessageBundle\FormHandler\ReplyMessageFormHandler; - -use FOS\MessageBundle\FormFactory\NewThreadMessageFormFactory; -use FOS\MessageBundle\FormHandler\NewThreadMessageFormHandler; - -use FOS\MessageBundle\Deleter\Deleter; -use FOS\MessageBundle\EntityManager\ThreadManager; - -use FOS\MessageBundle\Search\QueryFactory; -use FOS\MessageBundle\Search\Finder; - -use FOS\MessageBundle\Provider\Provider; - - -// service names - -// fos_message.reply_form.factory -// fos_message.reply_form.handler - -// router - -// fos_message.new_thread_form.factory -// fos_message.new_thread_form.handler - -// fos_message.deleter -// fos_message.thread_manager - -// fos_message.search_query_factory -// fos_message.search_finder - -// fos_message.provider +use Symfony\Component\DependencyInjection\ContainerInterface; class MessageController extends AbstractController { - protected $router; - protected $replyFormFactory; - protected $replyFormHandler; - protected $newThreadFormFactory; - protected $newThreadFormHandler; - protected $deleter; - protected $threadManager; - protected $searchQueryFactory; - protected $searchFinder; - protected $provider; - - public function __construct( - $container, - $router, - $replyFormFactory, - $replyFormHandler, - $newThreadFormFactory, - $newThreadFormHandler, - $deleter, - $threadManager, - $searchQueryFactory, - $searchFinder, - $provider - ) + public function __construct(ContainerInterface $container) { - $this->router = $router; - $this->replyFormFactory = $replyFormFactory; - $this->replyFormHandler = $replyFormHandler; - $this->newThreadFormFactory = $newThreadFormFactory; - $this->newThreadFormHandler = $newThreadFormHandler; - $this->deleter = $deleter; - $this->threadManager = $threadManager; - $this->searchQueryFactory = $searchQueryFactory; - $this->searchFinder = $searchFinder; - $this->provider = $provider; $this->setContainer($container); } + /** + * @var ContainerInterface + */ + protected $container; + /** * Displays the authenticated participant inbox. * @@ -135,11 +72,11 @@ public function deletedAction() public function threadAction($threadId) { $thread = $this->getProvider()->getThread($threadId); - $form = $this->replyFormFactory->create($thread); - $formHandler = $this->replyFormHandler; + $form = $this->container->get('fos_message.reply_form.factory')->create($thread); + $formHandler = $this->container->get('fos_message.reply_form.handler'); if ($message = $formHandler->process($form)) { - return new RedirectResponse($this->router->generate('fos_message_thread_view', array( + return new RedirectResponse($this->container->get('router')->generate('fos_message_thread_view', array( 'threadId' => $message->getThread()->getId(), ))); } @@ -157,11 +94,11 @@ public function threadAction($threadId) */ public function newThreadAction() { - $form = $this->newThreadFormFactory->create(); - $formHandler = $this->newThreadFormHandler; + $form = $this->container->get('fos_message.new_thread_form.factory')->create(); + $formHandler = $this->container->get('fos_message.new_thread_form.handler'); if ($message = $formHandler->process($form)) { - return new RedirectResponse($this->router->generate('fos_message_thread_view', array( + return new RedirectResponse($this->container->get('router')->generate('fos_message_thread_view', array( 'threadId' => $message->getThread()->getId(), ))); } @@ -182,10 +119,10 @@ public function newThreadAction() public function deleteAction($threadId) { $thread = $this->getProvider()->getThread($threadId); - $this->deleter->markAsDeleted($thread); - $this->threadManager->saveThread($thread); + $this->container->get('fos_message.deleter')->markAsDeleted($thread); + $this->container->get('fos_message.thread_manager')->saveThread($thread); - return new RedirectResponse($this->router->generate('fos_message_inbox')); + return new RedirectResponse($this->container->get('router')->generate('fos_message_inbox')); } /** @@ -198,10 +135,10 @@ public function deleteAction($threadId) public function undeleteAction($threadId) { $thread = $this->getProvider()->getThread($threadId); - $this->deleter->markAsUndeleted($thread); - $this->threadManager->saveThread($thread); + $this->container->get('fos_message.deleter')->markAsUndeleted($thread); + $this->container->get('fos_message.thread_manager')->saveThread($thread); - return new RedirectResponse($this->router->generate('fos_message_inbox')); + return new RedirectResponse($this->container->get('router')->generate('fos_message_inbox')); } /** @@ -211,8 +148,8 @@ public function undeleteAction($threadId) */ public function searchAction() { - $query = $this->searchQueryFactory->createFromRequest(); - $threads = $this->searchFinder->find($query); + $query = $this->container->get('fos_message.search_query_factory')->createFromRequest(); + $threads = $this->container->get('fos_message.search_finder')->find($query); return $this->render('@FOSMessage/Message/search.html.twig', array( 'query' => $query, @@ -227,6 +164,6 @@ public function searchAction() */ protected function getProvider() { - return $this->provider; + return $this->container->get('fos_message.provider'); } } diff --git a/Resources/config/config.xml b/Resources/config/config.xml index 30cd3e33..96ae5942 100644 --- a/Resources/config/config.xml +++ b/Resources/config/config.xml @@ -11,46 +11,6 @@ type="service" id="service_container" /> - - - - - - - - - - From 68f54e66d41faca429ef1d6d646658909f2ae021 Mon Sep 17 00:00:00 2001 From: Connor Graham Date: Sun, 5 May 2019 20:21:09 +0100 Subject: [PATCH 06/17] updated version numbers on composer and README --- README.md | 4 ++-- composer.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index bf1e6884..8743dcd5 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Documentation Documentation for this bundle is stored under `Resources/doc` in this repository. -[Read the documentation for the last stable (1.3)][] +[Read the documentation for the last stable (1.4)][] License ------- @@ -27,4 +27,4 @@ This bundle is under the MIT license. See the complete license in the bundle: Resources/meta/LICENSE ``` -[Read the documentation for the last stable (1.3)]: https://github.com/FriendsOfSymfony/FOSMessageBundle/blob/master/Resources/doc/00-index.md +[Read the documentation for the last stable (1.4)]: https://github.com/FriendsOfSymfony/FOSMessageBundle/blob/master/Resources/doc/00-index.md diff --git a/composer.json b/composer.json index 59cb72b7..e86c2a9c 100644 --- a/composer.json +++ b/composer.json @@ -45,7 +45,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.4-dev" } } } From 4bc2f817891fd6bbfe37dc16b501855968365732 Mon Sep 17 00:00:00 2001 From: Connor Graham Date: Sun, 5 May 2019 20:38:44 +0100 Subject: [PATCH 07/17] from travis results, moved back to old controller routes --- Resources/config/config.xml | 2 +- Resources/config/routing.xml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Resources/config/config.xml b/Resources/config/config.xml index 96ae5942..7acf5474 100644 --- a/Resources/config/config.xml +++ b/Resources/config/config.xml @@ -6,7 +6,7 @@ - + - fos_message.message_controller::inboxAction + FOS\MessageBundle\Controller\MessageController::inboxAction - fos_message.message_controller::sentAction + FOS\MessageBundle\Controller\MessageController::sentAction - fos_message.message_controller::deletedAction + FOS\MessageBundle\Controller\MessageController::deletedAction - fos_message.message_controller::searchAction + FOS\MessageBundle\Controller\MessageController::searchAction - fos_message.message_controller::newThreadAction + FOS\MessageBundle\Controller\MessageController::newThreadAction - fos_message.message_controller::deleteAction + FOS\MessageBundle\Controller\MessageController::deleteAction - fos_message.message_controller::undeleteAction + FOS\MessageBundle\Controller\MessageController::undeleteAction - fos_message.message_controller::threadAction + FOS\MessageBundle\Controller\MessageController::threadAction From c26264b4ebc8a51b3f3950d047b5c49f37b0718a Mon Sep 17 00:00:00 2001 From: Connor Graham Date: Sun, 5 May 2019 21:35:02 +0100 Subject: [PATCH 08/17] added composer install to try and fix travis issue on PHP 5.5 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index e18482bb..ac35dcad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,7 @@ matrix: - php: 7.2 before_install: + - composer install - echo "memory_limit=4G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini - phpenv config-rm xdebug.ini - if [ "$SYMFONY_LTS" != "" ]; then composer require --dev --no-update symfony/lts=$SYMFONY_LTS; fi From 744aa76de8acdb86443bc7b866f13fd486ea58fc Mon Sep 17 00:00:00 2001 From: Connor Graham Date: Sun, 5 May 2019 21:40:34 +0100 Subject: [PATCH 09/17] moved composer install to tackle memory issue --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ac35dcad..9ed4f3b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,10 +21,10 @@ matrix: - php: 7.2 before_install: - - composer install - echo "memory_limit=4G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini - phpenv config-rm xdebug.ini - if [ "$SYMFONY_LTS" != "" ]; then composer require --dev --no-update symfony/lts=$SYMFONY_LTS; fi + - composer install install: - composer update $COMPOSER_FLAGS From 4c24dc61d97cdb925251df822ec7c6bae6e193dd Mon Sep 17 00:00:00 2001 From: Connor Graham Date: Sun, 5 May 2019 23:00:21 +0100 Subject: [PATCH 10/17] added phpunit to composer and removed install via travis --- .travis.yml | 1 - composer.json | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9ed4f3b4..2130b2ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,5 @@ before_install: install: - composer update $COMPOSER_FLAGS - - ./phpunit install script: ./phpunit diff --git a/composer.json b/composer.json index e86c2a9c..074261c2 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,8 @@ "symfony/templating": "^2.8.45|^3.0|^4.0", "symfony/browser-kit": "^2.8.45|^3.0|^4.0", "symfony/phpunit-bridge": "^4.0", - "doctrine/orm": "^2.0" + "doctrine/orm": "^2.0", + "phpunit/phpunit": "^4.0" }, "suggest": { "doctrine/doctrine-bundle": "dev-master", From 539fe2775bfd7df59cf0cf32eddbc3ab77ef348d Mon Sep 17 00:00:00 2001 From: Connor Graham Date: Sun, 5 May 2019 23:08:36 +0100 Subject: [PATCH 11/17] added phpunit tests via CLI (symfony) --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2130b2ff..2762ff8b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,5 +28,4 @@ before_install: install: - composer update $COMPOSER_FLAGS - -script: ./phpunit + - php bin/phpunit From 4787363ec00b581896233e44059aa633ab2ee1f5 Mon Sep 17 00:00:00 2001 From: Connor Graham Date: Mon, 6 May 2019 00:21:19 +0100 Subject: [PATCH 12/17] experimental change for phpunit-bridge --- composer.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 074261c2..3d920c9f 100644 --- a/composer.json +++ b/composer.json @@ -31,9 +31,8 @@ "symfony/security-bundle": "^2.8.45|^3.0|^4.0", "symfony/templating": "^2.8.45|^3.0|^4.0", "symfony/browser-kit": "^2.8.45|^3.0|^4.0", - "symfony/phpunit-bridge": "^4.0", - "doctrine/orm": "^2.0", - "phpunit/phpunit": "^4.0" + "symfony/phpunit-bridge": "^4.2.8", + "doctrine/orm": "^2.0" }, "suggest": { "doctrine/doctrine-bundle": "dev-master", From ca5047d674c795e2f9a537f9776dad72f4ec3afb Mon Sep 17 00:00:00 2001 From: Connor Graham Date: Mon, 6 May 2019 00:23:03 +0100 Subject: [PATCH 13/17] changed travis build params back --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2762ff8b..debf57cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ matrix: fast_finish: true include: - php: 5.5 - env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_DEPRECATIONS_HELPER=weak + env: SYMFONY_LTS='^3' SYMFONY_DEPRECATIONS_HELPER=weak - php: 7.2 env: SYMFONY_LTS='^3' SYMFONY_DEPRECATIONS_HELPER=weak - php: 7.2 @@ -24,8 +24,9 @@ before_install: - echo "memory_limit=4G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini - phpenv config-rm xdebug.ini - if [ "$SYMFONY_LTS" != "" ]; then composer require --dev --no-update symfony/lts=$SYMFONY_LTS; fi - - composer install install: - composer update $COMPOSER_FLAGS - - php bin/phpunit + - ./phpunit install + +script: ./phpunit From dd808ce2835e3a32c215cac2e9bf470e136e46a3 Mon Sep 17 00:00:00 2001 From: Connor Graham Date: Mon, 6 May 2019 00:23:37 +0100 Subject: [PATCH 14/17] moved back to lowest symfony version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index debf57cc..e18482bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ matrix: fast_finish: true include: - php: 5.5 - env: SYMFONY_LTS='^3' SYMFONY_DEPRECATIONS_HELPER=weak + env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_DEPRECATIONS_HELPER=weak - php: 7.2 env: SYMFONY_LTS='^3' SYMFONY_DEPRECATIONS_HELPER=weak - php: 7.2 From 819f4be03ed30a9a38c9727e8654927434905d0a Mon Sep 17 00:00:00 2001 From: Connor Graham Date: Mon, 6 May 2019 00:32:04 +0100 Subject: [PATCH 15/17] trying a more backwards-compatible method for service injection --- Resources/config/config.xml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Resources/config/config.xml b/Resources/config/config.xml index 7acf5474..6cce2a72 100644 --- a/Resources/config/config.xml +++ b/Resources/config/config.xml @@ -7,10 +7,7 @@ - + From 33445f4dd18d1e432139fac0107b8c77f1a6e2e2 Mon Sep 17 00:00:00 2001 From: Connor Graham Date: Mon, 6 May 2019 00:38:02 +0100 Subject: [PATCH 16/17] making controller synthetic --- Resources/config/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/config/config.xml b/Resources/config/config.xml index 6cce2a72..adaefcfd 100644 --- a/Resources/config/config.xml +++ b/Resources/config/config.xml @@ -6,7 +6,7 @@ - + From 7b8e173fc5d99387539e87b5bb22a075acd05674 Mon Sep 17 00:00:00 2001 From: Connor Graham Date: Mon, 6 May 2019 00:41:41 +0100 Subject: [PATCH 17/17] removed synthetic, provided class argument instead --- Resources/config/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/config/config.xml b/Resources/config/config.xml index adaefcfd..4b2a7b1f 100644 --- a/Resources/config/config.xml +++ b/Resources/config/config.xml @@ -6,7 +6,7 @@ - +