Rename CI\Env to Environment + fix type compatibility with PHP 8

baraja-core · Feb 12, 2021 · 9745c18 · 9745c18
1 parent 8f16b08
commit 9745c18
Show file tree

Hide file tree

Showing 16 changed files with 35 additions and 35 deletions.
diff --git a/src/Ci/AbstractCi.php b/src/Ci/AbstractCi.php
@@ -10,10 +10,10 @@
  */
 abstract class AbstractCi implements CiInterface
 {
-	protected Env $env;
+	protected Environment $env;
 
 
-	public function __construct(Env $env)
+	public function __construct(Environment $env)
 	{
 		$this->env = $env;
 	}

diff --git a/src/Ci/AppVeyor.php b/src/Ci/AppVeyor.php
@@ -7,9 +7,9 @@
 
 class AppVeyor extends AbstractCi
 {
-	public function isDetected(Env $env): bool
+	public function isDetected(Environment $environment): bool
 	{
-		return $env->get('APPVEYOR') === 'True';
+		return $environment->get('APPVEYOR') === 'True';
 	}
 
 

diff --git a/src/Ci/Bamboo.php b/src/Ci/Bamboo.php
@@ -7,9 +7,9 @@
 
 class Bamboo extends AbstractCi
 {
-	public function isDetected(Env $env): bool
+	public function isDetected(Environment $environment): bool
 	{
-		return $env->get('bamboo_buildKey') !== false;
+		return $environment->get('bamboo_buildKey') !== false;
 	}
 
 

diff --git a/src/Ci/Buddy.php b/src/Ci/Buddy.php
@@ -7,9 +7,9 @@
 
 class Buddy extends AbstractCi
 {
-	public function isDetected(Env $env): bool
+	public function isDetected(Environment $environment): bool
 	{
-		return $env->get('BUDDY') !== false;
+		return $environment->get('BUDDY') !== false;
 	}
 
 

diff --git a/src/Ci/CiInterface.php b/src/Ci/CiInterface.php
@@ -10,7 +10,7 @@ interface CiInterface
 	/**
 	 * Return true if this CI was detected
 	 */
-	public function isDetected(Env $env): bool;
+	public function isDetected(Environment $environment): bool;
 
 	/**
 	 * Get name of the CI server type

diff --git a/src/Ci/Circle.php b/src/Ci/Circle.php
@@ -7,9 +7,9 @@
 
 class Circle extends AbstractCi
 {
-	public function isDetected(Env $env): bool
+	public function isDetected(Environment $environment): bool
 	{
-		return $env->get('CIRCLECI') !== false;
+		return $environment->get('CIRCLECI') !== false;
 	}
 
 

diff --git a/src/Ci/Codeship.php b/src/Ci/Codeship.php
@@ -7,9 +7,9 @@
 
 class Codeship extends AbstractCi
 {
-	public function isDetected(Env $env): bool
+	public function isDetected(Environment $environment): bool
 	{
-		return $env->get('CI_NAME') === 'codeship';
+		return $environment->get('CI_NAME') === 'codeship';
 	}
 
 

diff --git a/src/Ci/Continuousphp.php b/src/Ci/Continuousphp.php
@@ -7,9 +7,9 @@
 
 class Continuousphp extends AbstractCi
 {
-	public function isDetected(Env $env): bool
+	public function isDetected(Environment $environment): bool
 	{
-		return $env->get('CONTINUOUSPHP') === 'continuousphp';
+		return $environment->get('CONTINUOUSPHP') === 'continuousphp';
 	}
 
 

diff --git a/src/Ci/Drone.php b/src/Ci/Drone.php
@@ -7,9 +7,9 @@
 
 class Drone extends AbstractCi
 {
-	public function isDetected(Env $env): bool
+	public function isDetected(Environment $environment): bool
 	{
-		return $env->get('CI') === 'drone';
+		return $environment->get('CI') === 'drone';
 	}
 
 

diff --git a/src/Ci/Env.php → src/Ci/Environment.php b/src/Ci/Env.php → src/Ci/Environment.php
@@ -8,14 +8,14 @@
 /**
  * Encapsulate access to the environment variables
  */
-class Env
+final class Environment
 {
-	/**
-	 * @return string|false Environment variable value or false if the variable does not exist
-	 */
-	public function get(string $name)
+	/** Environment variable value or false if the variable does not exist. */
+	public function get(string $name): string|false
 	{
-		return getenv($name);
+		$env = getenv($name);
+
+		return \is_array($env) === true ? false : $env;
 	}
 
 

diff --git a/src/Ci/GitHubActions.php b/src/Ci/GitHubActions.php
@@ -10,9 +10,9 @@ class GitHubActions extends AbstractCi
 	public const GITHUB_BASE_URL = 'https://github.com';
 
 
-	public function isDetected(Env $env): bool
+	public function isDetected(Environment $environment): bool
 	{
-		return $env->get('GITHUB_ACTIONS') !== false;
+		return $environment->get('GITHUB_ACTIONS') !== false;
 	}
 
 

diff --git a/src/Ci/GitLab.php b/src/Ci/GitLab.php
@@ -7,9 +7,9 @@
 
 class GitLab extends AbstractCi
 {
-	public function isDetected(Env $env): bool
+	public function isDetected(Environment $environment): bool
 	{
-		return $env->get('GITLAB_CI') !== false;
+		return $environment->get('GITLAB_CI') !== false;
 	}
 
 

diff --git a/src/Ci/Jenkins.php b/src/Ci/Jenkins.php
@@ -7,9 +7,9 @@
 
 class Jenkins extends AbstractCi
 {
-	public function isDetected(Env $env): bool
+	public function isDetected(Environment $environment): bool
 	{
-		return $env->get('JENKINS_URL') !== false;
+		return $environment->get('JENKINS_URL') !== false;
 	}
 
 

diff --git a/src/Ci/TeamCity.php b/src/Ci/TeamCity.php
@@ -7,9 +7,9 @@
 
 class TeamCity extends AbstractCi
 {
-	public function isDetected(Env $env): bool
+	public function isDetected(Environment $environment): bool
 	{
-		return $env->get('TEAMCITY_VERSION') !== false;
+		return $environment->get('TEAMCITY_VERSION') !== false;
 	}
 
 

diff --git a/src/Ci/Travis.php b/src/Ci/Travis.php
@@ -10,9 +10,9 @@ class Travis extends AbstractCi
 	public const TRAVIS_BASE_URL = 'https://travis-ci.org';
 
 
-	public function isDetected(Env $env): bool
+	public function isDetected(Environment $environment): bool
 	{
-		return $env->get('TRAVIS') !== false;
+		return $environment->get('TRAVIS') !== false;
 	}
 
 

diff --git a/src/CiDetector.php b/src/CiDetector.php
@@ -36,12 +36,12 @@ final class CiDetector
 
 	public const CI_TRAVIS = 'Travis CI';
 
-	private Env $environment;
+	private Environment $environment;
 
 
 	public function __construct()
 	{
-		$this->environment = new Env;
+		$this->environment = new Environment;
 	}