Merge pull request #69 from Uxie-Framework/hotfix/Env-bug

Hotfix/env bug
Uxie-Framework · Apr 16, 2022 · 82762e2 · 82762e2
2 parents 792c7fd + 4b57967
commit 82762e2
Show file tree

Hide file tree

Showing 44 changed files with 93 additions and 89 deletions.
diff --git a/.env.example b/.env.example
@@ -10,7 +10,7 @@ PRODUCTION_MODE = OFF
 ERROR_REPORTING = -1
 
 # Time and region
-TIMEZONE = Africa/Algiers
+TIMEZONE = Europe/London
 
 # Database connection details
 DB_CNX  = mysql

diff --git a/.gitignore b/.gitignore
diff --git a/App/App.php b/App/App.php
diff --git a/App/Controllers/Controller.php b/App/Controllers/Controller.php
diff --git a/App/Filters/ExampleValidator.php b/App/Filters/ExampleValidator.php
diff --git a/App/Filters/Filterable.php b/App/Filters/Filterable.php
diff --git a/App/Middlewares/Csrf.php b/App/Middlewares/Csrf.php
diff --git a/App/Middlewares/NullifyInput.php b/App/Middlewares/NullifyInput.php
diff --git a/App/Middlewares/Statistics.php b/App/Middlewares/Statistics.php
diff --git a/App/MiddlewaresLocator.php b/App/MiddlewaresLocator.php
diff --git a/App/Models/Example.php b/App/Models/Example.php
diff --git a/App/Repositories/Example.php b/App/Repositories/Example.php
diff --git a/App/Routes.php b/App/Routes.php
diff --git a/App/Services/.gitkeep b/App/Services/.gitkeep
diff --git a/App/Views/CoreViews/error.blade.php b/App/Views/CoreViews/error.blade.php
diff --git a/App/Views/index.blade.php b/App/Views/index.blade.php
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/cache/.gitkeep b/cache/.gitkeep
diff --git a/cache/blade/.gitkeep b/cache/blade/.gitkeep
diff --git a/cache/pug/.gitkeep b/cache/pug/.gitkeep
diff --git a/composer.json b/composer.json
diff --git a/composer.lock b/composer.lock
diff --git a/database/migrations/20180209152652_statistics.php b/database/migrations/20180209152652_statistics.php
diff --git a/database/migrations/template.txt b/database/migrations/template.txt
diff --git a/defaults.php b/defaults.php
diff --git a/log/.gitkeep b/log/.gitkeep
diff --git a/phinx b/phinx
diff --git a/phinx.php b/phinx.php
@@ -1,7 +1,8 @@
 <?php
 
 // load our environment files - used to store credentials & configuration
-(new Dotenv\Dotenv('./'))->load();
+$dotENV = Dotenv\Dotenv::createUnsafeImmutable(__DIR__);
+$dotENV->load();
 
 return
     [

diff --git a/public/.htaccess b/public/.htaccess
diff --git a/public/css/files/fonts/grand-hotel.otf b/public/css/files/fonts/grand-hotel.otf
diff --git a/public/css/files/fonts/hand.ttf b/public/css/files/fonts/hand.ttf
diff --git a/public/css/files/fonts/regular.ttf b/public/css/files/fonts/regular.ttf
diff --git a/public/css/koala-config.json b/public/css/koala-config.json
diff --git a/public/css/main.css b/public/css/main.css
diff --git a/public/css/sass/_mixins.sass b/public/css/sass/_mixins.sass
diff --git a/public/css/sass/_variables.sass b/public/css/sass/_variables.sass
diff --git a/public/css/sass/main.sass b/public/css/sass/main.sass
diff --git a/public/index.php b/public/index.php
@@ -11,7 +11,12 @@
 // create IOC container
 IOC\IOC::createContainer();
 // Load .env file
-container()->build('Dotenv\Dotenv', __DIR__.'/../');
+// container()->build('Dotenv\Dotenv', [__DIR__ . '/../']);
+// container()->Dotenv->load();
+
+container()->bind('Dotenv', function () {
+    return Dotenv\Dotenv::createUnsafeImmutable(__DIR__ . '/../');
+});
 container()->Dotenv->load();
 
 // Load configuration

diff --git a/public/js/jquery.js b/public/js/jquery.js
diff --git a/public/js/public.js b/public/js/public.js
diff --git a/public/robots.txt b/public/robots.txt
diff --git a/resources/languages/Validations.php b/resources/languages/Validations.php
diff --git a/tests/BasicTest.php b/tests/BasicTest.php