From 400319f29640e46c87405804eb54e018fab7c58a Mon Sep 17 00:00:00 2001 From: dahromy Date: Tue, 9 Jul 2024 15:29:07 +0300 Subject: [PATCH 1/4] Add Glide bundle configuration files Added a manifest.json and a dahromy_glide.yaml to configure the Glide bundle in Symfony. The manifest.json includes the bundle and its environment-specific parameters, while the dahromy_glide.yaml sets up source, cache locations and the glide signature key. --- .../glide-symfony/config/packages/dahromy_glide.yaml | 4 ++++ dahromy/glide-symfony/manifest.json | 11 +++++++++++ 2 files changed, 15 insertions(+) create mode 100644 dahromy/glide-symfony/config/packages/dahromy_glide.yaml create mode 100644 dahromy/glide-symfony/manifest.json diff --git a/dahromy/glide-symfony/config/packages/dahromy_glide.yaml b/dahromy/glide-symfony/config/packages/dahromy_glide.yaml new file mode 100644 index 000000000..aa3e75419 --- /dev/null +++ b/dahromy/glide-symfony/config/packages/dahromy_glide.yaml @@ -0,0 +1,4 @@ +dahromy_glide: + source: '%kernel.project_dir%/public/uploads' + cache: '%kernel.project_dir%/var/cache/glide' + signature_key: '%env(GLIDE_SIGNATURE_KEY)%' \ No newline at end of file diff --git a/dahromy/glide-symfony/manifest.json b/dahromy/glide-symfony/manifest.json new file mode 100644 index 000000000..5bb7c1812 --- /dev/null +++ b/dahromy/glide-symfony/manifest.json @@ -0,0 +1,11 @@ +{ + "bundles": { + "DahRomy\\Glide\\DahRomyGlideBundle": ["all"] + }, + "copy-from-recipe": { + "config/": "%CONFIG_DIR%" + }, + "env": { + "GLIDE_SIGNATURE_KEY": "%generate(secret)%" + } +} \ No newline at end of file From 1bec9e925ae56b8052263015f24eab43202597ce Mon Sep 17 00:00:00 2001 From: dahromy Date: Tue, 9 Jul 2024 15:31:41 +0300 Subject: [PATCH 2/4] # This is the 1st commit message: Add 'gd' driver to dahromy_glide configuration The gd library driver has been added to the dahromy_glide.yaml configuration file. This change enables image processing capabilities provided by the gd library in the dahromy/glide-symfony project. # This is the commit message #2: Add base_url to glide configuration In the dahromy_glide.yaml configuration file, a new line specifying the base_url for image storage has been added. This amendment allows the glide library to know where to store and retrieve images. # This is the commit message #3: Add newline at the end of glide.yaml file A newline has been added at the end of the dahromy_glide.yaml file. This is in accordance with standard coding practices and helps to prevent any potential parsing errors due to the absence of a newline. # This is the commit message #4: Remove 'gd' driver and base_url from glide config The 'gd' driver and the 'base_url' configuration option have been removed from the Glide configuration. Other default configuration options can be added as needed. This change simplifies the default configuration. # This is the commit message #5: Move manifest and config files to 1.0 directory All manifest and config files have been moved to a newly created 1.0 directory. This change is to improve file organization and version control. The structure change does not bring any functionality differences. # This is the commit message #6: Add PHP version conflict in manifest.json The update adds a "conflict" field to the manifest.json which restricts the usage of the package with PHP versions less than 8.0. This ensures that the application is run on the supported PHP versions, preventing any compatibility issues. # This is the commit message #7: Add new project files and update configuration This commit introduces new .idea project files and updates DahRomy Glide Bundle routes and configuration. The various .idea files correspond to Project Modules, Git Toolbox settings and PHP options. Additionally, the Glide configuration has been altered to change the source directory and the signature key has been removed. Add new project files and update configuration This commit introduces new .idea project files and updates DahRomy Glide Bundle routes and configuration. The various .idea files correspond to Project Modules, Git Toolbox settings and PHP options. Additionally, the Glide configuration has been altered to change the source directory and the signature key has been removed. Add newline at end of YAML files and clean up .idea - Add newline at end of YAML configuration files - Remove .idea directory - Add .idea to .gitignore Add newline at end of YAML configuration files Two YAML configuration files in the glide-symfony project lacked a newline character at the end of the file. These have been added to the `glide.yaml` file in both the routes and packages directories, following the POSIX standards for text files. Remove .idea directory Add .idea to .gitignore Remove .gitignore --- dahromy/glide-symfony/1.0/config/packages/glide.yaml | 3 +++ dahromy/glide-symfony/1.0/config/routes/glide.yaml | 3 +++ dahromy/glide-symfony/{ => 1.0}/manifest.json | 5 ++++- dahromy/glide-symfony/config/packages/dahromy_glide.yaml | 4 ---- 4 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 dahromy/glide-symfony/1.0/config/packages/glide.yaml create mode 100644 dahromy/glide-symfony/1.0/config/routes/glide.yaml rename dahromy/glide-symfony/{ => 1.0}/manifest.json (81%) delete mode 100644 dahromy/glide-symfony/config/packages/dahromy_glide.yaml diff --git a/dahromy/glide-symfony/1.0/config/packages/glide.yaml b/dahromy/glide-symfony/1.0/config/packages/glide.yaml new file mode 100644 index 000000000..6e1d26021 --- /dev/null +++ b/dahromy/glide-symfony/1.0/config/packages/glide.yaml @@ -0,0 +1,3 @@ +glide: + source: '%kernel.project_dir%/public' + cache: '%kernel.project_dir%/var/cache/glide' diff --git a/dahromy/glide-symfony/1.0/config/routes/glide.yaml b/dahromy/glide-symfony/1.0/config/routes/glide.yaml new file mode 100644 index 000000000..f505dca50 --- /dev/null +++ b/dahromy/glide-symfony/1.0/config/routes/glide.yaml @@ -0,0 +1,3 @@ +glide: + resource: '@DahRomyGlideBundle/Resources/config/routes.php' + type: php diff --git a/dahromy/glide-symfony/manifest.json b/dahromy/glide-symfony/1.0/manifest.json similarity index 81% rename from dahromy/glide-symfony/manifest.json rename to dahromy/glide-symfony/1.0/manifest.json index 5bb7c1812..7b1f3835b 100644 --- a/dahromy/glide-symfony/manifest.json +++ b/dahromy/glide-symfony/1.0/manifest.json @@ -1,4 +1,7 @@ { + "conflict": { + "php": "<8.0" + }, "bundles": { "DahRomy\\Glide\\DahRomyGlideBundle": ["all"] }, @@ -8,4 +11,4 @@ "env": { "GLIDE_SIGNATURE_KEY": "%generate(secret)%" } -} \ No newline at end of file +} diff --git a/dahromy/glide-symfony/config/packages/dahromy_glide.yaml b/dahromy/glide-symfony/config/packages/dahromy_glide.yaml deleted file mode 100644 index aa3e75419..000000000 --- a/dahromy/glide-symfony/config/packages/dahromy_glide.yaml +++ /dev/null @@ -1,4 +0,0 @@ -dahromy_glide: - source: '%kernel.project_dir%/public/uploads' - cache: '%kernel.project_dir%/var/cache/glide' - signature_key: '%env(GLIDE_SIGNATURE_KEY)%' \ No newline at end of file From f8ce9826aec820c752f688e6351c9b845cb4d014 Mon Sep 17 00:00:00 2001 From: dahromy Date: Thu, 12 Sep 2024 10:58:42 +0300 Subject: [PATCH 3/4] Add initial configuration and setup for MVola bundle --- .../1.0.0/config/packages/mvola.yaml | 10 ++++++++++ .../mvola-bundle/1.0.0/config/routes/mvola.yaml | 2 ++ dahromy/mvola-bundle/1.0.0/manifest.json | 16 ++++++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 dahromy/mvola-bundle/1.0.0/config/packages/mvola.yaml create mode 100644 dahromy/mvola-bundle/1.0.0/config/routes/mvola.yaml create mode 100644 dahromy/mvola-bundle/1.0.0/manifest.json diff --git a/dahromy/mvola-bundle/1.0.0/config/packages/mvola.yaml b/dahromy/mvola-bundle/1.0.0/config/packages/mvola.yaml new file mode 100644 index 000000000..9c9a14a43 --- /dev/null +++ b/dahromy/mvola-bundle/1.0.0/config/packages/mvola.yaml @@ -0,0 +1,10 @@ +mvola: + environment: '%env(MVOLA_ENVIRONMENT)%' + merchant_number: '%env(MVOLA_MERCHANT_NUMBER)%' + company_name: '%env(MVOLA_COMPANY_NAME)%' + consumer_key: '%env(MVOLA_CONSUMER_KEY)%' + consumer_secret: '%env(MVOLA_CONSUMER_SECRET)%' + auth_url: '%env(MVOLA_AUTH_URL)%' + max_retries: 3 + retry_delay: 1000 + cache_ttl: 3600 diff --git a/dahromy/mvola-bundle/1.0.0/config/routes/mvola.yaml b/dahromy/mvola-bundle/1.0.0/config/routes/mvola.yaml new file mode 100644 index 000000000..07ec51a78 --- /dev/null +++ b/dahromy/mvola-bundle/1.0.0/config/routes/mvola.yaml @@ -0,0 +1,2 @@ +mvola: + resource: '@DahRomyMVolaBundle/Resources/config/routes.yaml' diff --git a/dahromy/mvola-bundle/1.0.0/manifest.json b/dahromy/mvola-bundle/1.0.0/manifest.json new file mode 100644 index 000000000..897c7a526 --- /dev/null +++ b/dahromy/mvola-bundle/1.0.0/manifest.json @@ -0,0 +1,16 @@ +{ + "bundles": { + "DahRomy\\Mvola\\DahRomyMvolaBundle": ["all"] + }, + "copy-from-recipe": { + "config/": "%CONFIG_DIR%" + }, + "env": { + "MVOLA_ENVIRONMENT": "sandbox", + "MVOLA_CONSUMER_KEY": "your_consumer_key_here", + "MVOLA_CONSUMER_SECRET": "your_consumer_secret_here", + "MVOLA_MERCHANT_NUMBER": "your_merchant_number_here", + "MVOLA_COMPANY_NAME": "your_company_name_here", + "MVOLA_AUTH_URL": "https://sandbox.mvola.mg/token" + } +} From 9182477a5c9cb24e6aecf0a53b742c24f0e47fc7 Mon Sep 17 00:00:00 2001 From: dahromy Date: Thu, 12 Sep 2024 11:30:33 +0300 Subject: [PATCH 4/4] Update version numbers and reorganize bundle directory structure --- dahromy/mvola-bundle/{1.0.0 => 1.0}/config/packages/mvola.yaml | 0 dahromy/mvola-bundle/{1.0.0 => 1.0}/config/routes/mvola.yaml | 0 dahromy/mvola-bundle/{1.0.0 => 1.0}/manifest.json | 0 nelmio/api-doc-bundle/3.0/config/packages/nelmio_api_doc.yaml | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) rename dahromy/mvola-bundle/{1.0.0 => 1.0}/config/packages/mvola.yaml (100%) rename dahromy/mvola-bundle/{1.0.0 => 1.0}/config/routes/mvola.yaml (100%) rename dahromy/mvola-bundle/{1.0.0 => 1.0}/manifest.json (100%) diff --git a/dahromy/mvola-bundle/1.0.0/config/packages/mvola.yaml b/dahromy/mvola-bundle/1.0/config/packages/mvola.yaml similarity index 100% rename from dahromy/mvola-bundle/1.0.0/config/packages/mvola.yaml rename to dahromy/mvola-bundle/1.0/config/packages/mvola.yaml diff --git a/dahromy/mvola-bundle/1.0.0/config/routes/mvola.yaml b/dahromy/mvola-bundle/1.0/config/routes/mvola.yaml similarity index 100% rename from dahromy/mvola-bundle/1.0.0/config/routes/mvola.yaml rename to dahromy/mvola-bundle/1.0/config/routes/mvola.yaml diff --git a/dahromy/mvola-bundle/1.0.0/manifest.json b/dahromy/mvola-bundle/1.0/manifest.json similarity index 100% rename from dahromy/mvola-bundle/1.0.0/manifest.json rename to dahromy/mvola-bundle/1.0/manifest.json diff --git a/nelmio/api-doc-bundle/3.0/config/packages/nelmio_api_doc.yaml b/nelmio/api-doc-bundle/3.0/config/packages/nelmio_api_doc.yaml index 4e6847943..30767e1ea 100644 --- a/nelmio/api-doc-bundle/3.0/config/packages/nelmio_api_doc.yaml +++ b/nelmio/api-doc-bundle/3.0/config/packages/nelmio_api_doc.yaml @@ -3,7 +3,7 @@ nelmio_api_doc: info: title: My App description: This is an awesome app! - version: 1.0.0 + version: 1.0 areas: # to filter documented areas path_patterns: - ^/api(?!/doc$) # Accepts routes under /api except /api/doc