Merge pull request #51 from monsieurbiz/feature/missing-returns

Correct missing returns which break everything

.github/workflows/recipe.yaml

@@ -55,8 +55,8 @@ jobs:
           key: composer2-php:${{ matrix.php }}-sylius:${{ matrix.sylius }}-${{ github.sha }}
           restore-keys: composer2-php:${{ matrix.php }}-sylius:${{ matrix.sylius }}-
 
-      - name: Composer v2
-        run: sudo composer self-update --2
+      - name: Composer
+        run: sudo composer self-update
 
       - name: Composer Github Auth
         run: composer config -g github-oauth.github.com ${{ github.token }}
@@ -74,6 +74,7 @@ jobs:
       - name: Setup some requirements
         working-directory: ./sylius
         run: |
+            composer config --no-plugins allow-plugins true
             composer config repositories.plugin '{"type": "path", "url": "../plugin/"}'
             composer config extra.symfony.allow-contrib true
             composer config secure-http false

.github/workflows/security.yaml

@@ -34,8 +34,8 @@ jobs:
       - run: mkdir -p /home/runner/{.composer/cache,.config/composer}
         if: steps.cache-composer.outputs.cache-hit != 'true'
 
-      - name: Composer v2
-        run: sudo composer self-update --2
+      - name: Composer
+        run: sudo composer self-update
 
       - name: Composer Github Auth
         run: composer config -g github-oauth.github.com ${{ github.token }}

.github/workflows/tests.yaml

@@ -48,8 +48,8 @@ jobs:
       - run: mkdir -p /home/runner/{.composer/cache,.config/composer}
         if: steps.cache-composer.outputs.cache-hit != 'true'
 
-      - name: Composer v2
-        run: sudo composer self-update --2
+      - name: Composer
+        run: sudo composer self-update
 
       - name: Composer Github Auth
         run: composer config -g github-oauth.github.com ${{ github.token }}

Makefile

@@ -69,6 +69,7 @@ setup_application:
 	(cd ${APP_DIR} && ${COMPOSER} config repositories.plugin '{"type": "path", "url": "../../"}')
 	(cd ${APP_DIR} && ${COMPOSER} config extra.symfony.allow-contrib true)
 	(cd ${APP_DIR} && ${COMPOSER} config minimum-stability dev)
+	(cd ${APP_DIR} && ${COMPOSER} config --no-plugins allow-plugins true)
 	(cd ${APP_DIR} && ${COMPOSER} require --no-install --no-scripts --no-progress sylius/sylius="~${SYLIUS_VERSION}") # Make sure to install the required version of sylius because the sylius-standard has a soft constraint
 	$(MAKE) ${APP_DIR}/.php-version
 	$(MAKE) ${APP_DIR}/php.ini

README.md

@@ -97,7 +97,7 @@ use MonsieurBiz\SyliusSettingsPlugin\Provider\SettingsProviderInterface;
 
     public function myAwesomeMethod()
     {
-        $this->settingsProvider->getSettingValue('app.default', 'demo_message')
+        return $this->settingsProvider->getSettingValue('app.default', 'demo_message')
     }
 ```
 

composer.json

@@ -69,5 +69,13 @@
         "branch-alias": {
             "dev-master": "1.0-dev"
         }
+    },
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "symfony/thanks": true,
+            "ergebnis/composer-normalize": true,
+            "symfony/flex": true
+        }
     }
 }

src/Provider/SettingsProvider.php

@@ -44,7 +44,7 @@ public function __construct(
      */
     public function getSettingValue(string $alias, string $path)
     {
-        $this->getSettingValueByChannelAndLocale(
+        return $this->getSettingValueByChannelAndLocale(
             $alias,
             $path,
             $this->channelContext->getChannel(),

src/Twig/Extension/SettingsExtension.php

@@ -45,7 +45,7 @@ public function getSettingValue(array $context, string $alias, string $path)
     {
         if (isset($context['sylius']) && $context['sylius'] instanceof ShopperContextInterface) {
             try {
-                $this->settingsProvider->getSettingValue($alias, $path);
+                return $this->settingsProvider->getSettingValue($alias, $path);
             } catch (SettingsException $settingsException) {
                 return null;
             }