Merge pull request #20 from silinternational/develop

Release 3.0.0

Author: mtompset

.gitignore

@@ -2,3 +2,4 @@ composer.phar
 /nbproject/
 /vendor/
 local.env
+composer.lock

.scrutinizer.yml

@@ -127,17 +127,24 @@ build_failure_conditions:
     - 'project.metric("scrutinizer.quality", < 6)'
 
 build:
-    environment:
-        php: 7.0.6
-        
-    dependencies:
-        before:
-            - composer install
+    nodes:
+        analysis:
+            tests:
+                override:
+                    - php-scrutinizer-run
 
-    tests:
-        override:
-            -
-                command: ./vendor/bin/phpunit --process-isolation --whitelist src/ --coverage-clover /tmp/coverage.xml tests/
-                coverage:
-                    file: /tmp/coverage.xml
-                    format: php-clover
+        tests-and-coverage:
+            environment:
+                php: 7.4.28
+                
+            dependencies:
+                before:
+                    - composer install
+        
+            tests:
+                override:
+                    -
+                        command: ./vendor/bin/phpunit --process-isolation --whitelist src/ --coverage-clover /tmp/coverage.xml tests/
+                        coverage:
+                            file: /tmp/coverage.xml
+                            format: php-clover

README.md

@@ -39,6 +39,21 @@ php values of `true`, `false`, or `null` respectively
     * NOTE: Any value string containing 'true' with any combination of case and/or leading/trailing whitespace still returns php `true`.  
 `false` and `null` are handled similarly.  Other value strings will have leading/trailing whitespace trimmed.
 
+1. __getString__ - `public static function getString($varname, $default = null): ?string`
+
+    * searches the local environment for `$varname` and returns the corresponding trimmed value string
+    * if `$varname` is not set or the value is empty (only whitespace), `getString` returns `$default` parameter
+
+1. __getBoolean__ - `public static function getBoolean($varname, $default = null): ?bool`
+
+    * searches the local environment for `$varname` and returns the corresponding boolean value string
+    * if `$varname` is not set or the value is empty (only whitespace), `getBoolean` returns `$default` parameter
+    * if the value string corresponding to `$varname` is 'true', 'false' or 'null', `getBoolean` returns
+      php values of `true`, `false`, or `null` respectively
+    * if the value is not boolean, `getBoolean` returns `$default` parameter
+    * NOTE: Any value string containing 'true' with any combination of case and/or leading/trailing whitespace still returns php `true`.
+      `false` and `null` are handled similarly.
+
 1. __getArray__ - `public static function getArray($varname, array $default = [])`
 
     * searches the local environment for `$varname` and returns the corresponding value string with comma separated elements as a php array

ci-tests.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -e
+
+composer install
+./vendor/bin/phpunit --process-isolation tests/

codeship-services.yml

@@ -0,0 +1,6 @@
+test:
+    image: silintl/php7:7.4
+    volumes:
+        - ./:/data
+    working_dir: /data
+

codeship-steps.yml

@@ -0,0 +1,3 @@
+- name: test
+  service: test
+  command: /data/ci-tests.sh

composer.json

@@ -7,10 +7,9 @@
         "psr-4": {"Sil\\PhpEnv\\": "src/"}
     },
     "require": {
-        "php": ">=5.4"
+        "php": "^7.4"
     },
     "require-dev": {
-        "johnkary/phpunit-speedtrap": "1.*",
-        "phpunit/phpunit": "^6.1"
+        "phpunit/phpunit": "^9.0"
     }
 }

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '2'
 services:
     test:
-        image: silintl/php7:latest
+        image: silintl/php7:7.4
         volumes:
             - ./:/data
         working_dir: /data

src/Env.php

@@ -2,7 +2,6 @@
 namespace Sil\PhpEnv;
 
 use Exception;
-use Sil\PhpEnv\EnvListNotAvailableException;
 
 class Env
 {
@@ -78,7 +77,33 @@ public static function get($varname, $default = null)
 
         return $trimmedValue;
     }
-    
+
+    public static function getString(string $varName, ?string $default = null): ?string
+    {
+        $originalValue = \getenv($varName);
+        if ($originalValue === false) {
+            return $default;
+        }
+
+        $trimmedValue = \trim($originalValue);
+        if ($trimmedValue === '') {
+            return $default;
+        }
+
+        return $trimmedValue;
+    }
+
+
+    public static function getBoolean(string $varName, ?bool $default = null): ?bool
+    {
+        $value = self::get($varName, $default);
+        if (is_bool($value)) {
+            return $value;
+        } else {
+            return $default;
+        }
+    }
+
     /**
      * 
      * @param string $varname