Merge branch 'master' of github:JBZoo/Utils

Author: hikouki

.editorconfig

@@ -0,0 +1,12 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 4

.gitignore

@@ -2,3 +2,6 @@ build/*
 vendor/*
 phpunit.xml
 composer.lock
+
+# phpstorm
+.idea

.travis.yml

@@ -6,9 +6,12 @@ php:
   - 5.5
   - 5.6
   - 7.0
+  - hhvm
 
 matrix:
   fast_finish: true
+  allow_failures:
+    - php: hhvm
   include:
     - php: 5.6
       env: XDEBUG_OFF="yes"

README.md

@@ -101,6 +101,15 @@ Cli::exec($command, $args = array(), $cwd = null, $verbose = false)
 
 // Build params for cli
 Cli::build($command, $args = array())
+
+// Returns true if STDOUT supports colorization.
+Cli::hasColorSupport()
+
+// Returns the number of columns of the terminal.
+Cli::getNumberOfColumns()
+
+// Returns if the file descriptor is an interactive terminal or not.
+Cli::isInteractive($fileDescriptor = self::STDOUT)
 ```
 
 
@@ -529,6 +538,9 @@ Str::esc($string)
 
 // Convert camel case to human readable format
 Str::splitCamelCase($input, $separator = '_', $toLower = true)
+
+// Generates a universally unique identifier (UUID v4) according to RFC 4122
+Str::uuid()
 ```
 
 
@@ -660,6 +672,64 @@ Email::getDomain(array('[email protected]', '[email protected]'));
 Email::getDomainSorted(array('[email protected]', '[email protected]'));
 ```
 
+## Timer
+```php
+use JBZoo\Utils\Timer;
+
+// Formats the elapsed time as a string.
+Timer::format($time);
+Timer::formatMS($time); // Only ms format
+
+// Formats the elapsed time since the start of the request as a string.
+Timer::timeSinceStart();
+
+// Get request time
+Timer::getRequestTime();
+```
+
+
+## Enviroment
+```php
+use JBZoo\Utils\Env;
+
+// Returns an environment variable.
+Env::get($name, $options = self::VAR_STRING);
+
+// Converts the type of values like "true", "false", "null" or "123".
+Env::convert($value, $options = self::VAR_STRING);
+
+// Returns true when Xdebug is supported or the runtime used is PHPDBG (PHP >= 7.0).
+Env::canCollectCodeCoverage();
+
+// Returns the path to the binary of the current runtime. Appends ' --php' to the path when the runtime is HHVM.
+Env::getBinary();
+
+// PHP Name and version
+Env::getNameWithVersion();
+
+// Get PHP Name
+Env::getName();
+
+// Get PHP Version
+Env::getVersion();
+
+// Returns true when the runtime used is PHP and Xdebug is loaded.
+Env::hasXdebug();
+
+// Returns true when the runtime used is HHVM.
+Env::isHHVM();
+
+// Returns true when the runtime used is PHP without the PHPDBG SAPI.
+Env::isPHP();
+
+// Returns true when the runtime used is PHP with the PHPDBG SAPI.
+Env::isPHPDBG();
+
+// Returns true when the runtime used is PHP with the PHPDBG SAPI and the phpdbg_*_oplog() functions are available (PHP >= 7.0).
+Env::hasPHPDBGCodeCoverage();
+```
+
+
 ## Links (ideas and some functions)
  * utilphp - https://github.com/brandonwamboldt/utilphp
  * PHPBinString - https://github.com/Grandt/PHPBinString
@@ -671,6 +741,9 @@ Email::getDomainSorted(array('[email protected]', '[email protected]'));
  * http://shiflett.org/blog/2006/mar/server-name-versus-http-host
  * https://github.com/joomla-framework/string
  * Askar (ARACOOL) https://github.com/ARACOOOL
+ * Sebastian Bergmann https://github.com/sebastianbergmann/php-timer
+ * Sebastian Bergmann https://github.com/sebastianbergmann/environment
+ * Oscar Otero https://github.com/oscarotero/env
 
 
 ## Unit tests and check code style

composer.json

@@ -4,7 +4,11 @@
     "description"       : "A collection of useful PHP functions, mini classes and snippets that you need every day.",
     "license"           : "MIT",
     "minimum-stability" : "stable",
-    "keywords"          : ["php", "helpers", "helper", "utility", "utils", "collection"],
+    "keywords"          : [
+        "helpers", "helper", "utility", "utils", "collection", "environment", "image", "filesystem",
+        "array", "cli", "command line", "dates", "email", "env", "filter", "http", "url", "serialize",
+        "slugif", "string", "mbstring", "timer", "misc"
+    ],
     "authors"           : [
         {
             "name"  : "SmetDenis",
@@ -24,14 +28,17 @@
         "php" : ">=5.3.10"
     },
     "require-dev"       : {
-        "jbzoo/phpunit" : "^1.2"
+        "jbzoo/phpunit" : "^1.5"
     },
     "suggest"           : {
         "ext-mbstring"              : "Provides multibyte specific string functions",
         "symfony/process"           : "For Cli::exec() method only",
         "symfony/polyfill-mbstring" : "For UTF-8 if ext-mbstring disabled"
     },
     "autoload"          : {
+        "files" : [
+            "src/defines.php"
+        ],
         "psr-4" : {
             "JBZoo\\Utils\\" : "src"
         }

phpunit.xml.dist

@@ -1,4 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--
+    JBZoo Utils
+
+    This file is part of the JBZoo CCK package.
+    For the full copyright and license information, please view the LICENSE
+    file that was distributed with this source code.
+
+    @package    Utils
+    @license    MIT
+    @copyright  Copyright (C) JBZoo.com,  All rights reserved.
+    @link       https://github.com/JBZoo/Utils
+-->
 <phpunit bootstrap="tests/autoload.php"
          colors="true"
          convertErrorsToExceptions="true"
@@ -29,7 +41,7 @@
     <logging>
         <log type="coverage-clover" target="build/logs/clover.xml"/>
         <log type="coverage-html" target="build/phpunit" lowUpperBound="80" highLowerBound="95"/>
-        <log type="coverage-text" target="php://stdout" showUncoveredFiles="false" showOnlySummary="true"/>
+        <log type="coverage-text" target="php://stdout" showUncoveredFiles="true" showOnlySummary="false"/>
     </logging>
 
 </phpunit>

src/Cli.php

@@ -10,6 +10,7 @@
  * @license   MIT
  * @copyright Copyright (C) JBZoo.com,  All rights reserved.
  * @link      https://github.com/JBZoo/Utils
+ * @author    Sebastian Bergmann <[email protected]>
  * @author    Denis Smetannikov <[email protected]>
  */
 
@@ -24,6 +25,10 @@
  */
 class Cli
 {
+    const STDIN  = 0;
+    const STDOUT = 1;
+    const STDERR = 2;
+
     /**
      * Is command line
      *
@@ -88,7 +93,7 @@ public static function err($message, $addEol = true)
     public static function exec($command, $args = array(), $cwd = null, $verbose = false)
     {
         if (!class_exists('\Symfony\Component\Process\Process')) {
-            throw new \Exception("Symfony/Process package required for Cli::exec() method");
+            throw new \Exception("Symfony/Process package required for Cli::exec() method"); // @codeCoverageIgnore
         }
 
         $cmd = self::build($command, $args);
@@ -147,7 +152,7 @@ public static function build($command, $args = array())
                     }
                 }
 
-                if ($value) {
+                if (strlen($value) > 0) {
                     $stringArgs[] = $key . '="' . addcslashes($value, '"') . '"';
                 } else {
                     $stringArgs[] = $key;
@@ -161,4 +166,102 @@ public static function build($command, $args = array())
 
         return $realCommand;
     }
+
+    /**
+     * Returns true if STDOUT supports colorization.
+     *
+     * This code has been copied and adapted from
+     * Symfony\Component\Console\Output\OutputStream.
+     *
+     * @return bool
+     * @codeCoverageIgnore
+     */
+    public static function hasColorSupport()
+    {
+        if (DIRECTORY_SEPARATOR == '\\') {
+
+            $winColor = Env::get('ANSICON', Env::VAR_BOOL)
+                || 'ON' === Env::get('ConEmuANSI')
+                || 'xterm' === Env::get('TERM');
+
+            return $winColor;
+        }
+
+        if (!defined('STDOUT')) {
+            return false;
+        }
+
+        return self::isInteractive(STDOUT);
+    }
+
+    /**
+     * Returns the number of columns of the terminal.
+     *
+     * @return int
+     * @codeCoverageIgnore
+     */
+    public static function getNumberOfColumns()
+    {
+        if (DIRECTORY_SEPARATOR == '\\') {
+            $columns = 80;
+
+            if (preg_match('/^(\d+)x\d+ \(\d+x(\d+)\)$/', trim(getenv('ANSICON')), $matches)) {
+                $columns = $matches[1];
+
+            } elseif (function_exists('proc_open')) {
+                $process = proc_open(
+                    'mode CON',
+                    array(
+                        1 => array('pipe', 'w'),
+                        2 => array('pipe', 'w'),
+                    ),
+                    $pipes,
+                    null,
+                    null,
+                    array('suppress_errors' => true)
+                );
+
+                if (is_resource($process)) {
+                    $info = stream_get_contents($pipes[1]);
+                    fclose($pipes[1]);
+                    fclose($pipes[2]);
+                    proc_close($process);
+                    if (preg_match('/--------+\r?\n.+?(\d+)\r?\n.+?(\d+)\r?\n/', $info, $matches)) {
+                        $columns = $matches[2];
+                    }
+                }
+            }
+
+            return $columns - 1;
+        }
+
+        if (!self::isInteractive(self::STDIN)) {
+            return 80;
+        }
+
+        if (preg_match('#\d+ (\d+)#', shell_exec('stty size'), $match) === 1) {
+            if ((int)$match[1] > 0) {
+                return (int)$match[1];
+            }
+        }
+
+        if (preg_match('#columns = (\d+);#', shell_exec('stty'), $match) === 1) {
+            if ((int)$match[1] > 0) {
+                return (int)$match[1];
+            }
+        }
+
+        return 80;
+    }
+
+    /**
+     * Returns if the file descriptor is an interactive terminal or not.
+     *
+     * @param int|resource $fileDescriptor
+     * @return bool
+     */
+    public static function isInteractive($fileDescriptor = self::STDOUT)
+    {
+        return function_exists('posix_isatty') && @posix_isatty($fileDescriptor);
+    }
 }

src/Dates.php

@@ -19,7 +19,7 @@
 use \DateTimeZone;
 
 /**
- * Class Time
+ * Class Dates
  * @package JBZoo\Utils
  */
 class Dates