From 4452c5d03cfe95e2e3d9a914bcc143d38a507ea5 Mon Sep 17 00:00:00 2001 From: cbeauvoi Date: Thu, 21 Feb 2019 12:52:04 +0100 Subject: [PATCH 01/12] debug change directory --- StorageBundle/DependencyInjection/StorageExtension.php | 1 + 1 file changed, 1 insertion(+) diff --git a/StorageBundle/DependencyInjection/StorageExtension.php b/StorageBundle/DependencyInjection/StorageExtension.php index 055b4eb..126a9a9 100644 --- a/StorageBundle/DependencyInjection/StorageExtension.php +++ b/StorageBundle/DependencyInjection/StorageExtension.php @@ -18,6 +18,7 @@ class StorageExtension extends Extension */ public function load(array $configs, ContainerBuilder $container) { + dump("configs => ", $configs); die; $loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../Ressources/config')); $loader->load('services.yaml'); $configuration = $this->getConfiguration($configs, $container); From 06dd76e276f3fcb8904d56ee9c4363ec6cef2882 Mon Sep 17 00:00:00 2001 From: cbeauvoi Date: Thu, 21 Feb 2019 12:53:17 +0100 Subject: [PATCH 02/12] debug change directory --- StorageBundle/DependencyInjection/StorageExtension.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StorageBundle/DependencyInjection/StorageExtension.php b/StorageBundle/DependencyInjection/StorageExtension.php index 126a9a9..aec4905 100644 --- a/StorageBundle/DependencyInjection/StorageExtension.php +++ b/StorageBundle/DependencyInjection/StorageExtension.php @@ -18,10 +18,10 @@ class StorageExtension extends Extension */ public function load(array $configs, ContainerBuilder $container) { - dump("configs => ", $configs); die; $loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../Ressources/config')); $loader->load('services.yaml'); $configuration = $this->getConfiguration($configs, $container); + dump($configuration); die; $config = $this->processConfiguration($configuration, $configs); $definition = $container->getDefinition('bluesquare.storage'); From cccb7af889d598c5b4e79ab4b4d2e02eae23b75f Mon Sep 17 00:00:00 2001 From: cbeauvoi Date: Thu, 21 Feb 2019 12:53:47 +0100 Subject: [PATCH 03/12] debug change directory --- StorageBundle/DependencyInjection/StorageExtension.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/StorageBundle/DependencyInjection/StorageExtension.php b/StorageBundle/DependencyInjection/StorageExtension.php index aec4905..0f6f3f1 100644 --- a/StorageBundle/DependencyInjection/StorageExtension.php +++ b/StorageBundle/DependencyInjection/StorageExtension.php @@ -21,9 +21,10 @@ class StorageExtension extends Extension $loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../Ressources/config')); $loader->load('services.yaml'); $configuration = $this->getConfiguration($configs, $container); - dump($configuration); die; $config = $this->processConfiguration($configuration, $configs); + dump($config); die; + $definition = $container->getDefinition('bluesquare.storage'); $definition->setArgument(0, $config); From 5d8efab159517b88d0a6b5a3a7ebbc5463ca0f64 Mon Sep 17 00:00:00 2001 From: cbeauvoi Date: Thu, 21 Feb 2019 12:55:49 +0100 Subject: [PATCH 04/12] debug change directory --- StorageBundle/DependencyInjection/Configuration.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StorageBundle/DependencyInjection/Configuration.php b/StorageBundle/DependencyInjection/Configuration.php index 0359ba9..704d629 100644 --- a/StorageBundle/DependencyInjection/Configuration.php +++ b/StorageBundle/DependencyInjection/Configuration.php @@ -16,7 +16,7 @@ class Configuration implements ConfigurationInterface public function getConfigTreeBuilder() { $treeBuilder = new TreeBuilder(); - $root = $treeBuilder->root('storage'); + $root = $treeBuilder->root('bluesquare/storage'); $root->useAttributeAsKey('storage_name') ->prototype('array') ->children() From b6c80c295cec2d0b0ab8c8b6f8ea8a29a0b82099 Mon Sep 17 00:00:00 2001 From: cbeauvoi Date: Thu, 21 Feb 2019 12:56:18 +0100 Subject: [PATCH 05/12] debug change directory --- StorageBundle/DependencyInjection/Configuration.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/StorageBundle/DependencyInjection/Configuration.php b/StorageBundle/DependencyInjection/Configuration.php index 704d629..4af0cff 100644 --- a/StorageBundle/DependencyInjection/Configuration.php +++ b/StorageBundle/DependencyInjection/Configuration.php @@ -15,8 +15,8 @@ class Configuration implements ConfigurationInterface */ public function getConfigTreeBuilder() { - $treeBuilder = new TreeBuilder(); - $root = $treeBuilder->root('bluesquare/storage'); + $treeBuilder = new TreeBuilder('bluesquare/storage'); + $root = $treeBuilder->root('storage'); $root->useAttributeAsKey('storage_name') ->prototype('array') ->children() From 85e147c8e811dd91fa35a14e34e090e5e68eaa81 Mon Sep 17 00:00:00 2001 From: cbeauvoi Date: Thu, 21 Feb 2019 13:00:02 +0100 Subject: [PATCH 06/12] debug change directory --- StorageBundle/DependencyInjection/Configuration.php | 2 +- StorageBundle/Ressources/config/services.yaml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/StorageBundle/DependencyInjection/Configuration.php b/StorageBundle/DependencyInjection/Configuration.php index 4af0cff..fc0681a 100644 --- a/StorageBundle/DependencyInjection/Configuration.php +++ b/StorageBundle/DependencyInjection/Configuration.php @@ -15,7 +15,7 @@ class Configuration implements ConfigurationInterface */ public function getConfigTreeBuilder() { - $treeBuilder = new TreeBuilder('bluesquare/storage'); + $treeBuilder = new TreeBuilder('storage'); $root = $treeBuilder->root('storage'); $root->useAttributeAsKey('storage_name') ->prototype('array') diff --git a/StorageBundle/Ressources/config/services.yaml b/StorageBundle/Ressources/config/services.yaml index 61a4dec..532044d 100644 --- a/StorageBundle/Ressources/config/services.yaml +++ b/StorageBundle/Ressources/config/services.yaml @@ -1,3 +1,6 @@ +imports: + - { ressource: 'config/packages/bluesquare/storage.yaml'} + services: bluesquare.storage: class: Bluesquare\StorageBundle\Storage From 411cdf92abbca5222a523cab536ec65b61b494eb Mon Sep 17 00:00:00 2001 From: cbeauvoi Date: Thu, 21 Feb 2019 13:03:25 +0100 Subject: [PATCH 07/12] debug change directory --- StorageBundle/DependencyInjection/StorageExtension.php | 1 + 1 file changed, 1 insertion(+) diff --git a/StorageBundle/DependencyInjection/StorageExtension.php b/StorageBundle/DependencyInjection/StorageExtension.php index 0f6f3f1..1243589 100644 --- a/StorageBundle/DependencyInjection/StorageExtension.php +++ b/StorageBundle/DependencyInjection/StorageExtension.php @@ -21,6 +21,7 @@ class StorageExtension extends Extension $loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../Ressources/config')); $loader->load('services.yaml'); $configuration = $this->getConfiguration($configs, $container); + dump($container); die; $config = $this->processConfiguration($configuration, $configs); dump($config); die; From 907fb0d29c5000ab7872fa0916067fcece8438e1 Mon Sep 17 00:00:00 2001 From: cbeauvoi Date: Thu, 21 Feb 2019 13:03:40 +0100 Subject: [PATCH 08/12] debug change directory --- StorageBundle/Ressources/config/services.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/StorageBundle/Ressources/config/services.yaml b/StorageBundle/Ressources/config/services.yaml index 532044d..61a4dec 100644 --- a/StorageBundle/Ressources/config/services.yaml +++ b/StorageBundle/Ressources/config/services.yaml @@ -1,6 +1,3 @@ -imports: - - { ressource: 'config/packages/bluesquare/storage.yaml'} - services: bluesquare.storage: class: Bluesquare\StorageBundle\Storage From 2613759624e46d6662cd4ff8186038025f28827c Mon Sep 17 00:00:00 2001 From: cbeauvoi Date: Thu, 21 Feb 2019 13:09:41 +0100 Subject: [PATCH 09/12] debug change directory --- StorageBundle/Ressources/config/services.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/StorageBundle/Ressources/config/services.yaml b/StorageBundle/Ressources/config/services.yaml index 61a4dec..ab30533 100644 --- a/StorageBundle/Ressources/config/services.yaml +++ b/StorageBundle/Ressources/config/services.yaml @@ -1,3 +1,6 @@ +imports: + - { ressource: config/bluesquare/storage.yaml } + services: bluesquare.storage: class: Bluesquare\StorageBundle\Storage From 37013aa6492254e9eeeed5856e89900dfe0adb11 Mon Sep 17 00:00:00 2001 From: cbeauvoi Date: Thu, 21 Feb 2019 13:10:24 +0100 Subject: [PATCH 10/12] debug change directory --- StorageBundle/Ressources/config/services.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/StorageBundle/Ressources/config/services.yaml b/StorageBundle/Ressources/config/services.yaml index ab30533..2866b66 100644 --- a/StorageBundle/Ressources/config/services.yaml +++ b/StorageBundle/Ressources/config/services.yaml @@ -1,6 +1,3 @@ -imports: - - { ressource: config/bluesquare/storage.yaml } - services: bluesquare.storage: class: Bluesquare\StorageBundle\Storage @@ -8,3 +5,5 @@ services: public: true arguments: ['user_storage'] Bluesquare\StorageBundle\Storage: '@bluesquare.storage' + imports: + - { ressource: config/bluesquare/storage.yaml } From b5cef5f5a3828bededd0782e1ef395fd10b73e6a Mon Sep 17 00:00:00 2001 From: cbeauvoi Date: Thu, 21 Feb 2019 13:12:52 +0100 Subject: [PATCH 11/12] debug change directory --- .../DependencyInjection/StorageExtension.php | 4 +- StorageBundle/Storage.php | 1 + composer.lock | 86 ++++++++++++++++++++-- 3 files changed, 83 insertions(+), 8 deletions(-) diff --git a/StorageBundle/DependencyInjection/StorageExtension.php b/StorageBundle/DependencyInjection/StorageExtension.php index 1243589..672e8de 100644 --- a/StorageBundle/DependencyInjection/StorageExtension.php +++ b/StorageBundle/DependencyInjection/StorageExtension.php @@ -21,10 +21,10 @@ class StorageExtension extends Extension $loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../Ressources/config')); $loader->load('services.yaml'); $configuration = $this->getConfiguration($configs, $container); - dump($container); die; +// dump($config); die; $config = $this->processConfiguration($configuration, $configs); - dump($config); die; +// dump($config); die; $definition = $container->getDefinition('bluesquare.storage'); $definition->setArgument(0, $config); diff --git a/StorageBundle/Storage.php b/StorageBundle/Storage.php index 060dc30..c9a969e 100644 --- a/StorageBundle/Storage.php +++ b/StorageBundle/Storage.php @@ -23,6 +23,7 @@ class Storage public function __construct(array $user_config = []) { + dump($user_config); die; $this->config_storage = $user_config; } diff --git a/composer.lock b/composer.lock index eeef08c..8d8311e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ee1506d010b16feb41b779df9e156bc2", + "content-hash": "e0fd4d7a1648530618008debe3b39eb2", "packages": [ { "name": "aws/aws-sdk-php", - "version": "3.87.14", + "version": "3.87.15", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "1d442bd93d3648e403ab895b5e1f464b4aa1b376" + "reference": "21a4dd314e2a3c44b5538dd56d3770733a3d03e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/1d442bd93d3648e403ab895b5e1f464b4aa1b376", - "reference": "1d442bd93d3648e403ab895b5e1f464b4aa1b376", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/21a4dd314e2a3c44b5538dd56d3770733a3d03e6", + "reference": "21a4dd314e2a3c44b5538dd56d3770733a3d03e6", "shasum": "" }, "require": { @@ -86,7 +86,81 @@ "s3", "sdk" ], - "time": "2019-02-19T19:08:06+00:00" + "time": "2019-02-20T19:11:08+00:00" + }, + { + "name": "doctrine/event-manager", + "version": "v1.0.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/event-manager.git", + "reference": "a520bc093a0170feeb6b14e9d83f3a14452e64b3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/event-manager/zipball/a520bc093a0170feeb6b14e9d83f3a14452e64b3", + "reference": "a520bc093a0170feeb6b14e9d83f3a14452e64b3", + "shasum": "" + }, + "require": { + "php": "^7.1" + }, + "conflict": { + "doctrine/common": "<2.9@dev" + }, + "require-dev": { + "doctrine/coding-standard": "^4.0", + "phpunit/phpunit": "^7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Common\\": "lib/Doctrine/Common" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + }, + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" + } + ], + "description": "Doctrine Event Manager component", + "homepage": "https://www.doctrine-project.org/projects/event-manager.html", + "keywords": [ + "event", + "eventdispatcher", + "eventmanager" + ], + "time": "2018-06-11T11:59:03+00:00" }, { "name": "guzzlehttp/guzzle", From 7517d07d306779ccaa4b64f0f4ab877904fafd59 Mon Sep 17 00:00:00 2001 From: cbeauvoi Date: Thu, 21 Feb 2019 13:19:36 +0100 Subject: [PATCH 12/12] debug change directory --- StorageBundle/DependencyInjection/StorageExtension.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/StorageBundle/DependencyInjection/StorageExtension.php b/StorageBundle/DependencyInjection/StorageExtension.php index 672e8de..7af35e0 100644 --- a/StorageBundle/DependencyInjection/StorageExtension.php +++ b/StorageBundle/DependencyInjection/StorageExtension.php @@ -20,11 +20,12 @@ class StorageExtension extends Extension { $loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../Ressources/config')); $loader->load('services.yaml'); + $sLoader = new YamlFileLoader($container, new FileLocator('/config/packages/bluesquare')); + $sLoader->load('storage.yaml'); $configuration = $this->getConfiguration($configs, $container); -// dump($config); die; $config = $this->processConfiguration($configuration, $configs); -// dump($config); die; + dump($sLoader, $container, $configuration, $config); die; $definition = $container->getDefinition('bluesquare.storage'); $definition->setArgument(0, $config);