From 602e11d5e770a50c2f4402b283b615d89d949081 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@alejandrocelaya.com>
Date: Sun, 16 Jul 2017 09:28:40 +0200
Subject: [PATCH] Added namespace to functions

---
 config/autoload/app_options.global.php        |  4 +-
 config/autoload/entity-manager.global.php     |  8 ++-
 config/autoload/translator.global.php         |  4 +-
 config/autoload/url-shortener.global.php      |  7 +-
 module/CLI/config/cli.config.php              |  3 +-
 .../CLI/src/Command/Tag/RenameTagCommand.php  |  2 -
 .../test/Command/Tag/CreateTagCommandTest.php |  2 -
 .../test/Command/Tag/ListTagsCommandTest.php  |  2 -
 .../test/Command/Tag/RenameTagCommandTest.php |  2 -
 module/Common/functions/functions.php         | 64 +++++++++----------
 module/Common/src/Factory/CacheFactory.php    |  8 +--
 11 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/config/autoload/app_options.global.php b/config/autoload/app_options.global.php
index e3f8fbdd..fd7147a1 100644
--- a/config/autoload/app_options.global.php
+++ b/config/autoload/app_options.global.php
@@ -1,10 +1,12 @@
 <?php
+use Shlinkio\Shlink\Common;
+
 return [
 
     'app_options' => [
         'name' => 'Shlink',
         'version' => '1.2.0',
-        'secret_key' => env('SECRET_KEY'),
+        'secret_key' => Common\env('SECRET_KEY'),
     ],
 
 ];
diff --git a/config/autoload/entity-manager.global.php b/config/autoload/entity-manager.global.php
index 6bdcae77..803eb8ff 100644
--- a/config/autoload/entity-manager.global.php
+++ b/config/autoload/entity-manager.global.php
@@ -1,4 +1,6 @@
 <?php
+use Shlinkio\Shlink\Common;
+
 return [
 
     'entity_manager' => [
@@ -6,9 +8,9 @@ return [
             'proxies_dir' => 'data/proxies',
         ],
         'connection' => [
-            'user' => env('DB_USER'),
-            'password' => env('DB_PASSWORD'),
-            'dbname' => env('DB_NAME', 'shlink'),
+            'user' => Common\env('DB_USER'),
+            'password' => Common\env('DB_PASSWORD'),
+            'dbname' => Common\env('DB_NAME', 'shlink'),
             'charset' => 'utf8',
         ],
     ],
diff --git a/config/autoload/translator.global.php b/config/autoload/translator.global.php
index d0561cbe..2ce6bb44 100644
--- a/config/autoload/translator.global.php
+++ b/config/autoload/translator.global.php
@@ -1,8 +1,10 @@
 <?php
+use Shlinkio\Shlink\Common;
+
 return [
 
     'translator' => [
-        'locale' => env('DEFAULT_LOCALE', 'en'),
+        'locale' => Common\env('DEFAULT_LOCALE', 'en'),
     ],
 
 ];
diff --git a/config/autoload/url-shortener.global.php b/config/autoload/url-shortener.global.php
index 5b0d95c9..f17d192d 100644
--- a/config/autoload/url-shortener.global.php
+++ b/config/autoload/url-shortener.global.php
@@ -1,14 +1,15 @@
 <?php
+use Shlinkio\Shlink\Common;
 use Shlinkio\Shlink\Core\Service\UrlShortener;
 
 return [
 
     'url_shortener' => [
         'domain' => [
-            'schema' => env('SHORTENED_URL_SCHEMA', 'http'),
-            'hostname' => env('SHORTENED_URL_HOSTNAME'),
+            'schema' => Common\env('SHORTENED_URL_SCHEMA', 'http'),
+            'hostname' => Common\env('SHORTENED_URL_HOSTNAME'),
         ],
-        'shortcode_chars' => env('SHORTCODE_CHARS', UrlShortener::DEFAULT_CHARS),
+        'shortcode_chars' => Common\env('SHORTCODE_CHARS', UrlShortener::DEFAULT_CHARS),
     ],
 
 ];
diff --git a/module/CLI/config/cli.config.php b/module/CLI/config/cli.config.php
index bd7161c1..a7a4fb9b 100644
--- a/module/CLI/config/cli.config.php
+++ b/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,
diff --git a/module/CLI/src/Command/Tag/RenameTagCommand.php b/module/CLI/src/Command/Tag/RenameTagCommand.php
index 7fd97b5e..e3ee678e 100644
--- a/module/CLI/src/Command/Tag/RenameTagCommand.php
+++ b/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;
diff --git a/module/CLI/test/Command/Tag/CreateTagCommandTest.php b/module/CLI/test/Command/Tag/CreateTagCommandTest.php
index 6dab8d86..5042e695 100644
--- a/module/CLI/test/Command/Tag/CreateTagCommandTest.php
+++ b/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;
diff --git a/module/CLI/test/Command/Tag/ListTagsCommandTest.php b/module/CLI/test/Command/Tag/ListTagsCommandTest.php
index 2c3a0a90..a4adc55d 100644
--- a/module/CLI/test/Command/Tag/ListTagsCommandTest.php
+++ b/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;
diff --git a/module/CLI/test/Command/Tag/RenameTagCommandTest.php b/module/CLI/test/Command/Tag/RenameTagCommandTest.php
index 032bfcc7..5bf56f64 100644
--- a/module/CLI/test/Command/Tag/RenameTagCommandTest.php
+++ b/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;
diff --git a/module/Common/functions/functions.php b/module/Common/functions/functions.php
index f0f86f77..4956ddf0 100644
--- a/module/Common/functions/functions.php
+++ b/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);
 }
diff --git a/module/Common/src/Factory/CacheFactory.php b/module/Common/src/Factory/CacheFactory.php
index 73cc9d2e..8f1b69ba 100644
--- a/module/Common/src/Factory/CacheFactory.php
+++ b/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);
                 }