dotenv implementation cont

.gitignore

@@ -1 +1,3 @@
 .env
+/vendor/
+

.htaccess

@@ -1,4 +1,4 @@
-php_flag display_errors Off
+php_flag display_errors On
 # php_value error_reporting -1
 RedirectMatch 403 ^/\.well-known
 Options -Indexes

header01.php

@@ -8,6 +8,8 @@ $is_logged_in = isset($_SESSION['user_id']);
 if (isset($_SESSION['user_id'])) {
     $is_member = getUserMemberStatus($_SESSION['user_id']);
     $user_id = $_SESSION['user_id'];
+} else {
+    $is_member = false;
 }
 $role = getUserRole();
 logVisitor();

login.php

@@ -5,7 +5,7 @@ require_once 'google-client/vendor/autoload.php';
 $client = new Google_Client();
 $client->setClientId('948441222188-8qhboq2urr8o9n35mc70s5h2nhd52v0m.apps.googleusercontent.com');
 $client->setClientSecret('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');
-$client->setRedirectUri('https://4wdcsa.co.za/validate_login.php');
+$client->setRedirectUri($_ENV['HOST'] . '/validate_login.php');
 $client->addScope("email");
 $client->addScope("profile");
 

testenv.php

@@ -0,0 +1,7 @@
+<?php
+require_once __DIR__ . '/vendor/autoload.php';
+
+$dotenv = Dotenv\Dotenv::createImmutable(__DIR__);
+$dotenv->load();
+
+echo "HOST: " . $_ENV['HOST'];

vendor/autoload.php

@@ -14,12 +14,9 @@ if (PHP_VERSION_ID < 50600) {
             echo $err;
         }
     }
-    trigger_error(
+    throw new RuntimeException($err);
-        $err,
-        E_USER_ERROR
-    );
 }
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit8f8443657afa9e4122281017b10fc4c8::getLoader();
+return ComposerAutoloaderInit4f947e5b57034e67caa05c4fc1c4b2dc::getLoader();

vendor/composer/InstalledVersions.php

@@ -26,12 +26,23 @@ use Composer\Semver\VersionParser;
  */
 class InstalledVersions
 {
+    /**
+     * @var string|null if set (by reflection by Composer), this should be set to the path where this class is being copied to
+     * @internal
+     */
+    private static $selfDir = null;
+
     /**
      * @var mixed[]|null
      * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
      */
     private static $installed;
 
+    /**
+     * @var bool
+     */
+    private static $installedIsLocalDir;
+
     /**
      * @var bool|null
      */
@@ -309,6 +320,24 @@ class InstalledVersions
     {
         self::$installed = $data;
         self::$installedByVendor = array();
+
+        // when using reload, we disable the duplicate protection to ensure that self::$installed data is
+        // always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not,
+        // so we have to assume it does not, and that may result in duplicate data being returned when listing
+        // all installed packages for example
+        self::$installedIsLocalDir = false;
+    }
+
+    /**
+     * @return string
+     */
+    private static function getSelfDir()
+    {
+        if (self::$selfDir === null) {
+            self::$selfDir = strtr(__DIR__, '\\', '/');
+        }
+
+        return self::$selfDir;
     }
 
     /**
@@ -322,19 +351,27 @@ class InstalledVersions
         }
 
         $installed = array();
+        $copiedLocalDir = false;
 
         if (self::$canGetVendors) {
+            $selfDir = self::getSelfDir();
             foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
+                $vendorDir = strtr($vendorDir, '\\', '/');
                 if (isset(self::$installedByVendor[$vendorDir])) {
                     $installed[] = self::$installedByVendor[$vendorDir];
                 } elseif (is_file($vendorDir.'/composer/installed.php')) {
                     /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
                     $required = require $vendorDir.'/composer/installed.php';
-                    $installed[] = self::$installedByVendor[$vendorDir] = $required;
+                    self::$installedByVendor[$vendorDir] = $required;
-                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
+                    $installed[] = $required;
-                        self::$installed = $installed[count($installed) - 1];
+                    if (self::$installed === null && $vendorDir.'/composer' === $selfDir) {
+                        self::$installed = $required;
+                        self::$installedIsLocalDir = true;
                     }
                 }
+                if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) {
+                    $copiedLocalDir = true;
+                }
             }
         }
 
@@ -350,7 +387,7 @@ class InstalledVersions
             }
         }
 
-        if (self::$installed !== array()) {
+        if (self::$installed !== array() && !$copiedLocalDir) {
             $installed[] = self::$installed;
         }
 

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit8f8443657afa9e4122281017b10fc4c8
+class ComposerAutoloaderInit4f947e5b57034e67caa05c4fc1c4b2dc
 {
     private static $loader;
 
@@ -24,16 +24,16 @@ class ComposerAutoloaderInit8f8443657afa9e4122281017b10fc4c8
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInit8f8443657afa9e4122281017b10fc4c8', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit4f947e5b57034e67caa05c4fc1c4b2dc', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit8f8443657afa9e4122281017b10fc4c8', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit4f947e5b57034e67caa05c4fc1c4b2dc', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit8f8443657afa9e4122281017b10fc4c8::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit4f947e5b57034e67caa05c4fc1c4b2dc::getInitializer($loader));
 
         $loader->register(true);
 
-        $filesToLoad = \Composer\Autoload\ComposerStaticInit8f8443657afa9e4122281017b10fc4c8::$files;
+        $filesToLoad = \Composer\Autoload\ComposerStaticInit4f947e5b57034e67caa05c4fc1c4b2dc::$files;
         $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
             if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
                 $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit8f8443657afa9e4122281017b10fc4c8
+class ComposerStaticInit4f947e5b57034e67caa05c4fc1c4b2dc
 {
     public static $files = array (
         '7b11c4dc42b3b3023073cb14e519683c' => __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php',
@@ -111,10 +111,10 @@ class ComposerStaticInit8f8443657afa9e4122281017b10fc4c8
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit8f8443657afa9e4122281017b10fc4c8::$prefixLengthsPsr4;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit4f947e5b57034e67caa05c4fc1c4b2dc::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit8f8443657afa9e4122281017b10fc4c8::$prefixDirsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit4f947e5b57034e67caa05c4fc1c4b2dc::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInit8f8443657afa9e4122281017b10fc4c8::$prefixesPsr0;
+            $loader->prefixesPsr0 = ComposerStaticInit4f947e5b57034e67caa05c4fc1c4b2dc::$prefixesPsr0;
-            $loader->classMap = ComposerStaticInit8f8443657afa9e4122281017b10fc4c8::$classMap;
+            $loader->classMap = ComposerStaticInit4f947e5b57034e67caa05c4fc1c4b2dc::$classMap;
 
         }, null, ClassLoader::class);
     }

vendor/composer/installed.json

@@ -24,7 +24,7 @@
             },
             "time": "2024-07-20T21:45:45+00:00",
             "type": "library",
-            "installation-source": "source",
+            "installation-source": "dist",
             "autoload": {
                 "psr-4": {
                     "GrahamCampbell\\ResultType\\": "src/"
@@ -495,7 +495,7 @@
                     "dev-master": "1.9-dev"
                 }
             },
-            "installation-source": "source",
+            "installation-source": "dist",
             "autoload": {
                 "psr-4": {
                     "PhpOption\\": "src/PhpOption/"
@@ -858,7 +858,7 @@
                     "name": "symfony/polyfill"
                 }
             },
-            "installation-source": "source",
+            "installation-source": "dist",
             "autoload": {
                 "files": [
                     "bootstrap.php"
@@ -941,7 +941,7 @@
                     "name": "symfony/polyfill"
                 }
             },
-            "installation-source": "source",
+            "installation-source": "dist",
             "autoload": {
                 "files": [
                     "bootstrap.php"
@@ -1018,7 +1018,7 @@
                     "name": "symfony/polyfill"
                 }
             },
-            "installation-source": "source",
+            "installation-source": "dist",
             "autoload": {
                 "files": [
                     "bootstrap.php"
@@ -1118,7 +1118,7 @@
                     "dev-master": "5.6-dev"
                 }
             },
-            "installation-source": "source",
+            "installation-source": "dist",
             "autoload": {
                 "psr-4": {
                     "Dotenv\\": "src/"

vendor/composer/installed.php

@@ -1,9 +1,9 @@
 <?php return array(
     'root' => array(
         'name' => '__root__',
-        'pretty_version' => 'dev-main',
+        'pretty_version' => '1.0.0+no-version-set',
-        'version' => 'dev-main',
+        'version' => '1.0.0.0',
-        'reference' => 'ac357402cabe33ab46fd8f677e956e1d2aa8409a',
+        'reference' => null,
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -11,9 +11,9 @@
     ),
     'versions' => array(
         '__root__' => array(
-            'pretty_version' => 'dev-main',
+            'pretty_version' => '1.0.0+no-version-set',
-            'version' => 'dev-main',
+            'version' => '1.0.0.0',
-            'reference' => 'ac357402cabe33ab46fd8f677e956e1d2aa8409a',
+            'reference' => null,
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),