🐛 fixed non composer setups

Signed-off-by: Bruno Meilick <[email protected]>

Author: bnomei

README.md

@@ -16,6 +16,11 @@ This plugin is free but if you use it in a commercial project please consider to
 - [buy me ☕](https://buymeacoff.ee/bnomei) or
 - [buy a Kirby license using this affiliate link](https://a.paddle.com/v2/click/1129/35731?link=1170)
 
+## Similar Plugins
+
+- [beebmx/kirby-env](https://github.com/beebmx/kirby-env)
+- [johannschopplich/kirby-extended](https://github.com/johannschopplich/kirby-extended)
+
 ## Installation
 
 - unzip [master.zip](https://github.com/bnomei/kirby3-dotenv/archive/master.zip) as folder `site/plugins/kirby3-dotenv` or
@@ -53,6 +58,7 @@ echo $_ENV['APP_MODE']; // production
 echo env('APP_DEBUG'); // false
 // or
 echo $page->getenv('ALGOLIA_APIKEY'); // 12d7331a21d8a28b3069c49830f463e833e30f6d
+echo $page->env('ALGOLIA_APIKEY'); // 12d7331a21d8a28b3069c49830f463e833e30f6d
 ```
 
 **on staging server**
@@ -61,6 +67,7 @@ echo $_ENV['APP_MODE']; // staging
 echo env('APP_DEBUG'); // true
 // or
 echo $page->getenv('ALGOLIA_APIKEY'); // 37e30ad867ff3a427317dcd1852abbd692b39ffc
+echo $page->env('ALGOLIA_APIKEY'); // 37e30ad867ff3a427317dcd1852abbd692b39ffc
 ```
 
 ## Usage in Config files

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "bnomei/kirby3-dotenv",
   "type": "kirby-plugin",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Kirby 3 Plugin for environment variables from .env",
   "license": "MIT",
   "authors": [

composer.lock

@@ -0,0 +1,17 @@
+<?php
+
+require_once __DIR__ . '/classes/DotEnv.php';
+
+if (! function_exists('loadenv')) {
+    function loadenv(array $options = [])
+    {
+        return \Bnomei\DotEnv::load($options);
+    }
+}
+
+if (! function_exists('env')) {
+    function env(string $env)
+    {
+        return \Bnomei\DotEnv::getenv($env);
+    }
+}

global.php

@@ -1,6 +1,7 @@
 <?php
 
 @include_once __DIR__ . '/vendor/autoload.php';
+@include_once __DIR__ . '/global.php';
 
 Kirby::plugin('bnomei/dotenv', [
     'options' => [
@@ -16,22 +17,11 @@
         }
     ],
     'pageMethods' => [
+        'env' => function (string $env) {
+            return \Bnomei\DotEnv::getenv($env);
+        },
         'getenv' => function (string $env) {
             return \Bnomei\DotEnv::getenv($env);
         },
     ],
 ]);
-
-if (! function_exists('loadenv')) {
-    function loadenv(array $options = [])
-    {
-        return \Bnomei\DotEnv::load($options);
-    }
-}
-
-if (! function_exists('env')) {
-    function env(string $env)
-    {
-        return \Bnomei\DotEnv::getenv($env);
-    }
-}

index.php

@@ -1,8 +1,8 @@
 <?php
 
 // load dotenv plugins class so getenv can be used outside of closures
-require_once __DIR__ . '/../../../classes/DotEnv.php';
-// require_once __DIR__ . '/../plugins/kirby3-dotenv/classes/DotEnv.php';
+require_once __DIR__ . '/../../../global.php';
+// require_once __DIR__ . '/../plugins/kirby3-dotenv/global.php';
 
 loadenv([
     'dir' => realpath(__DIR__ . '/../../'),

tests/site/config/config.staging.php

@@ -27,8 +27,8 @@ class InstalledVersions
 private static $installed = array (
   'root' => 
   array (
-    'pretty_version' => '2.0.0',
-    'version' => '2.0.0.0',
+    'pretty_version' => '2.0.1',
+    'version' => '2.0.1.0',
     'aliases' => 
     array (
     ),
@@ -39,8 +39,8 @@ class InstalledVersions
   array (
     'bnomei/kirby3-dotenv' => 
     array (
-      'pretty_version' => '2.0.0',
-      'version' => '2.0.0.0',
+      'pretty_version' => '2.0.1',
+      'version' => '2.0.1.0',
       'aliases' => 
       array (
       ),

vendor/composer/InstalledVersions.php

@@ -1,8 +1,8 @@
 <?php return array (
   'root' => 
   array (
-    'pretty_version' => '2.0.0',
-    'version' => '2.0.0.0',
+    'pretty_version' => '2.0.1',
+    'version' => '2.0.1.0',
     'aliases' => 
     array (
     ),
@@ -13,8 +13,8 @@
   array (
     'bnomei/kirby3-dotenv' => 
     array (
-      'pretty_version' => '2.0.0',
-      'version' => '2.0.0.0',
+      'pretty_version' => '2.0.1',
+      'version' => '2.0.1.0',
       'aliases' => 
       array (
       ),