Merge pull request #1302 from hydephp/check-for-config-flags-in-server-globals-when-loading-the-configuration

emmadesilva · web-flow · commit 7be6b5957684 · 2023-03-15T15:35:25.000+01:00
Check for config flags in server globals when loading the configuration
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -22,7 +22,7 @@ This serves two purposes:
 - for now removed features.
 
 ### Fixed
-- for any bug fixes.
+- Fixed https://github.com/hydephp/develop/issues/1301 in https://github.com/hydephp/develop/pull/1302
 
 ### Security
 - in case of vulnerabilities.
diff --git a/packages/framework/src/Foundation/Internal/LoadConfiguration.php b/packages/framework/src/Foundation/Internal/LoadConfiguration.php
@@ -34,6 +34,8 @@ protected function loadConfigurationFiles(Application $app, RepositoryContract $
         parent::loadConfigurationFiles($app, $repository);
 
         $this->mergeConfigurationFiles($repository);
+
+        $this->loadRuntimeConfiguration($app, $repository);
     }
 
     private function mergeConfigurationFiles(RepositoryContract $repository): void
@@ -73,4 +75,14 @@ private static function providePharSupportIfNeeded(array &$files): void
             $files['app'] = dirname(__DIR__, 6).DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'app.php';
         }
     }
+
+    private function loadRuntimeConfiguration(Application $app, RepositoryContract $repository)
+    {
+        if ($app->runningInConsole() && isset($_SERVER['argv'])) {
+            // Check if the `--pretty-urls` CLI argument is set, and if so, set the config value accordingly.
+            if (in_array('--pretty-urls', $_SERVER['argv'], true)) {
+                $repository->set('hyde.pretty_urls', true);
+            }
+        }
+    }
 }
diff --git a/packages/framework/tests/Unit/LoadConfigurationTest.php b/packages/framework/tests/Unit/LoadConfigurationTest.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit;
+
+use Hyde\Foundation\Application;
+use Hyde\Foundation\Internal\LoadConfiguration;
+use Hyde\Testing\UnitTestCase;
+
+/**
+ * @covers \Hyde\Foundation\Internal\LoadConfiguration
+ */
+class LoadConfigurationTest extends UnitTestCase
+{
+    public function testItLoadsRuntimeConfiguration()
+    {
+        $serverBackup = $_SERVER;
+
+        $_SERVER['argv'] = ['--pretty-urls'];
+
+        $app = new Application(getcwd());
+
+        $loader = new LoadConfiguration();
+        $loader->bootstrap($app);
+
+        $this->assertTrue(config('hyde.pretty_urls'));
+
+        $_SERVER = $serverBackup;
+
+        $loader->bootstrap($app);
+        $this->assertFalse(config('hyde.pretty_urls'));
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,8 @@ protected function loadConfigurationFiles(Application $app, RepositoryContract $`
`34`	`34`	`parent::loadConfigurationFiles($app, $repository);`
`35`	`35`
`36`	`36`	`$this->mergeConfigurationFiles($repository);`
	`37`	`+`
	`38`	`+ $this->loadRuntimeConfiguration($app, $repository);`
`37`	`39`	`}`
`38`	`40`
`39`	`41`	`private function mergeConfigurationFiles(RepositoryContract $repository): void`
`@@ -73,4 +75,14 @@ private static function providePharSupportIfNeeded(array &$files): void`
`73`	`75`	`$files['app'] = dirname(__DIR__, 6).DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'app.php';`
`74`	`76`	`}`
`75`	`77`	`}`
	`78`	`+`
	`79`	`+ private function loadRuntimeConfiguration(Application $app, RepositoryContract $repository)`
	`80`	`+ {`
	`81`	`+ if ($app->runningInConsole() && isset($_SERVER['argv'])) {`
	`82`	+ // Check if the `--pretty-urls` CLI argument is set, and if so, set the config value accordingly.
	`83`	`+ if (in_array('--pretty-urls', $_SERVER['argv'], true)) {`
	`84`	`+ $repository->set('hyde.pretty_urls', true);`
	`85`	`+ }`
	`86`	`+ }`
	`87`	`+ }`
`76`	`88`	`}`