Added namespace to functions

module/CLI/config/cli.config.php

@@ -1,10 +1,11 @@
 <?php
 use Shlinkio\Shlink\CLI\Command;
+use Shlinkio\Shlink\Common;
 
 return [
 
     'cli' => [
-        'locale' => env('CLI_LOCALE', 'en'),
+        'locale' => Common\env('CLI_LOCALE', 'en'),
         'commands' => [
             Command\Shortcode\GenerateShortcodeCommand::class,
             Command\Shortcode\ResolveUrlCommand::class,

module/CLI/src/Command/Tag/RenameTagCommand.php

@@ -1,6 +1,4 @@
 <?php
-declare(strict_types=1);
-
 namespace Shlinkio\Shlink\CLI\Command\Tag;
 
 use Acelaya\ZsmAnnotatedServices\Annotation as DI;

module/CLI/test/Command/Tag/CreateTagCommandTest.php

@@ -1,6 +1,4 @@
 <?php
-declare(strict_types=1);
-
 namespace ShlinkioTest\Shlink\CLI\Command\Tag;
 
 use PHPUnit\Framework\TestCase;

module/CLI/test/Command/Tag/ListTagsCommandTest.php

@@ -1,6 +1,4 @@
 <?php
-declare(strict_types=1);
-
 namespace ShlinkioTest\Shlink\CLI\Command\Tag;
 
 use Prophecy\Prophecy\MethodProphecy;

module/CLI/test/Command/Tag/RenameTagCommandTest.php

@@ -1,6 +1,4 @@
 <?php
-declare(strict_types=1);
-
 namespace ShlinkioTest\Shlink\CLI\Command\Tag;
 
 use PHPUnit\Framework\TestCase;

module/Common/functions/functions.php

@@ -1,36 +1,36 @@
 <?php
-if (! function_exists('env')) {
-    /**
-     * Gets the value of an environment variable. Supports boolean, empty and null.
-     * This is basically Laravel's env helper
-     *
-     * @param string $key
-     * @param mixed $default
-     * @return mixed
-     * @link https://github.com/laravel/framework/blob/5.2/src/Illuminate/Foundation/helpers.php#L369
-     */
-    function env($key, $default = null)
-    {
-        $value = getenv($key);
-        if ($value === false) {
-            return $default;
-        }
+namespace Shlinkio\Shlink\Common;
 
-        switch (strtolower($value)) {
-            case 'true':
-            case '(true)':
-                return true;
-            case 'false':
-            case '(false)':
-                return false;
-            case 'empty':
-            case '(empty)':
-                return '';
-            case 'null':
-            case '(null)':
-                return null;
-        }
-
-        return trim($value);
+/**
+ * Gets the value of an environment variable. Supports boolean, empty and null.
+ * This is basically Laravel's env helper
+ *
+ * @param string $key
+ * @param mixed $default
+ * @return mixed
+ * @link https://github.com/laravel/framework/blob/5.2/src/Illuminate/Foundation/helpers.php#L369
+ */
+function env($key, $default = null)
+{
+    $value = getenv($key);
+    if ($value === false) {
+        return $default;
     }
+
+    switch (strtolower($value)) {
+        case 'true':
+        case '(true)':
+            return true;
+        case 'false':
+        case '(false)':
+            return false;
+        case 'empty':
+        case '(empty)':
+            return '';
+        case 'null':
+        case '(null)':
+            return null;
+    }
+
+    return trim($value);
 }

module/Common/src/Factory/CacheFactory.php

@@ -4,6 +4,7 @@ namespace Shlinkio\Shlink\Common\Factory;
 use Doctrine\Common\Cache;
 use Interop\Container\ContainerInterface;
 use Interop\Container\Exception\ContainerException;
+use Shlinkio\Shlink\Common;
 use Shlinkio\Shlink\Core\Options\AppOptions;
 use Zend\ServiceManager\Exception\ServiceNotCreatedException;
 use Zend\ServiceManager\Exception\ServiceNotFoundException;
@@ -48,15 +49,14 @@ class CacheFactory implements FactoryInterface
     {
         // Try to get the adapter from config
         $config = $container->get('config');
-        if (isset($config['cache'])
-            && isset($config['cache']['adapter'])
+        if (isset($config['cache'], $config['cache']['adapter'])
             && in_array($config['cache']['adapter'], self::VALID_CACHE_ADAPTERS)
         ) {
             return $this->resolveCacheAdapter($config['cache']);
         }
 
         // If the adapter has not been set in config, create one based on environment
-        return env('APP_ENV', 'pro') === 'pro' ? new Cache\ApcuCache() : new Cache\ArrayCache();
+        return Common\env('APP_ENV', 'pro') === 'pro' ? new Cache\ApcuCache() : new Cache\ArrayCache();
     }
 
     /**
@@ -80,7 +80,7 @@ class CacheFactory implements FactoryInterface
                     if (! isset($server['host'])) {
                         continue;
                     }
-                    $port = isset($server['port']) ? intval($server['port']) : 11211;
+                    $port = isset($server['port']) ? (int) $server['port'] : 11211;
 
                     $memcached->addServer($server['host'], $port);
                 }