update, add some methods

Author: inhere

src/Collections/LiteCollection.php

@@ -14,6 +14,26 @@
  */
 class LiteCollection extends \ArrayObject implements CollectionInterface
 {
+    /**
+     * @param array|null $items
+     * @return static
+     */
+    public static function make($items = null)
+    {
+        return new static((array)$items);
+    }
+
+    /**
+     * Create new collection
+     * @param array $items Pre-populate collection with this key-value array
+     */
+    public function __construct(array $items = [])
+    {
+        parent::__construct();
+
+        $this->replace($items);
+    }
+
     /**
      * @param string $name
      * @param null|mixed $default

src/Components/ErrorHandler.php

@@ -52,7 +52,7 @@ class ErrorHandler
      */
     public function __construct(LoggerInterface $logger, array $options = [])
     {
-        Obj::smartConfigure($this, $options);
+        Obj::init($this, $options);
 
         $this->logger = $logger;
     }
@@ -218,6 +218,7 @@ public function handleFatalError()
         $this->reservedMemory = null;
 
         $lastError = error_get_last();
+
         if ($lastError && in_array($lastError['type'], self::$fatalErrors, true)) {
             $this->logger->log(
                 $this->fatalLevel ?? LogLevel::ALERT,
@@ -230,6 +231,10 @@ public function handleFatalError()
                 ]
             );
 
+            if (method_exists($this->logger, 'flush')) {
+                $this->logger->flush();
+            }
+
             if ($this->logger instanceof Logger) {
                 foreach ($this->logger->getHandlers() as $handler) {
                     if ($handler instanceof AbstractHandler) {

src/Components/Language.php

@@ -120,39 +120,39 @@ protected function init()
      * {@inheritdoc}
      * @see self::translate()
      */
-    public function t($key, array $args = [], $default = '')
+    public function t($key, array $args = [], $lang = '')
     {
-        return $this->translate($key, $args, $default);
+        return $this->translate($key, $args, $lang);
     }
 
     /**
      * {@inheritdoc}
      * @see self::translate()
      */
-    public function tl($key, array $args = [], $default = null)
+    public function tl($key, array $args = [], $lang = null)
     {
-        return $this->translate($key, $args, $default);
+        return $this->translate($key, $args, $lang);
     }
 
     /**
      * {@inheritdoc}
      * @see self::translate()
      */
-    public function trans($key, array $args = [], $default = null)
+    public function trans($key, array $args = [], $lang = null)
     {
-        return $this->translate($key, $args, $default);
+        return $this->translate($key, $args, $lang);
     }
 
     /**
      * how to use language translate ? please see '/doc/language.md'
      * @param string|bool $key
      * @param array $args
-     * @param string $default
+     * @param string $lang
      * @return string|array
      * @throws \Inhere\Exceptions\NotFoundException
      * @throws \InvalidArgumentException
      */
-    public function translate($key, array $args = [], $default = null)
+    public function translate($key, array $args = [], $lang = null)
     {
         if (!is_string($key)) {
             throw new \InvalidArgumentException('The translate key must be a string.');
@@ -162,14 +162,16 @@ public function translate($key, array $args = [], $default = null)
             throw new \InvalidArgumentException('Cannot translate the empty key');
         }
 
+        list($lang, $key) = $this->parseKey($key, $lang);
+
         // translate form current language. if not found, translate form fallback language.
         if (($value = $this->findTranslationText($key)) === null) {
-            $value = $this->transByFallbackLang($key, $default);
+            $value = $this->transByFallbackLang($key);
         }
 
         // no translate text
         if ($value === '' || $value === null) {
-            return ucfirst(Str::toSnakeCase(str_replace(['-', '_'], ' ', $key), ' '));
+            return ucfirst(Str::toSnake(str_replace(['-', '_'], ' ', $key), ' '));
         }
 
         // $args is not empty
@@ -238,13 +240,12 @@ protected function findTranslationText($key)
 
     /**
      * @param string $key
-     * @param string $default
      * @return mixed
      */
-    protected function transByFallbackLang($key, $default = null)
+    protected function transByFallbackLang($key)
     {
         if ($this->lang === $this->fallbackLang || !$this->fallbackLang) {
-            return $default;
+            return null;
         }
 
         // init fallbackData
@@ -278,17 +279,40 @@ protected function transByFallbackLang($key, $default = null)
                 $this->loadedFiles[] = $file;
                 $this->fallbackData->set($fileKey, Collection::read($file, $this->format));
 
-                return $this->fallbackData->get($key, $default);
+                return $this->fallbackData->get($key);
             }
         }
 
-        return $default;
+        return null;
     }
 
+
     /*********************************************************************************
-     * helper method
+     * helper
      *********************************************************************************/
 
+    /**
+     * @param string $key
+     * @param string $lang
+     * @return array
+     */
+    private function parseKey($key, $lang = null)
+    {
+        if ($lang) {
+            return [$lang, $key];
+        }
+
+        if (strpos($key, $this->separator)) {
+            $info = explode($this->separator, $key, 2);
+
+            if ($this->isLang($info[0])) {
+                return $info;
+            }
+        }
+
+        return [$this->lang, $key];
+    }
+
     /**
      * @param $filename
      * @param string $lang
@@ -376,6 +400,19 @@ public function hasLangFileData($fileKey)
      * getter/setter
      *********************************************************************************/
 
+    /**
+     * @param string $lang
+     * @return bool
+     */
+    public function hasLang($lang)
+    {
+        return $this->isLang($lang);
+    }
+    public function isLang($lang)
+    {
+        return $lang && in_array($lang, $this->langs,true);
+    }
+
     /**
      * Allow quick access default file translate by `$lang->key`,
      * is equals to `$lang->tl('key')`.

src/Helpers/Str.php

@@ -15,4 +15,18 @@
  */
 class Str extends StringHelper
 {
+    /**
+     * @param string $string
+     * @param string $prefix
+     * @param string $suffix
+     * @return string
+     */
+    public static function optional(string $string, string $prefix = ' ', string $suffix = ''): string
+    {
+        if (empty($string)) {
+            return '';
+        }
+
+        return $prefix . $string . $suffix;
+    }
 }

src/Helpers/StringHelper.php

@@ -568,18 +568,23 @@ public static function truncateString($text, $length = 120, array $options = arr
         return $truncate;
     }
 
+    public static function toCamel($str, $upperFirstChar = false)
+    {
+        return self::toCamelCase($str, $upperFirstChar);
+    }
+
     /**
      * Translates a string with underscores into camel case (e.g. first_name -> firstName)
      * @prototype string public static function toCamelCase(string $str[, bool $capitalise_first_char = false])
      * @param $str
-     * @param bool $upper_case_first_char
+     * @param bool $upperFirstChar
      * @return mixed
      */
-    public static function toCamelCase($str, $upper_case_first_char = false)
+    public static function toCamelCase($str, $upperFirstChar = false)
     {
         $str = self::strtolower($str);
 
-        if ($upper_case_first_char) {
+        if ($upperFirstChar) {
             $str = self::ucfirst($str);
         }
 
@@ -588,6 +593,11 @@ public static function toCamelCase($str, $upper_case_first_char = false)
         }, $str);
     }
 
+    public static function toSnake($str, $sep = '_')
+    {
+        return self::toSnakeCase($str, $sep);
+    }
+
     /**
      * Transform a CamelCase string to underscore_case string
      * @param string $str
@@ -697,7 +707,7 @@ public static function wordFormat($keyword)
     }
 
     /**
-     * 缩进格式化内容，去空白/注释 已不会影响到 HEREDOC 标记
+     * 缩进格式化内容，去空白/注释
      * @param $fileName
      * @param int $type
      * @return mixed

src/Traits/PathResolverTrait.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: inhere
+ * Date: 2017-10-23
+ * Time: 11:41
+ */
+
+namespace Inhere\Library\Traits;
+
+use Inhere\Library\Helpers\Php;
+
+/**
+ * Trait PathResolver
+ * @package Inhere\Library\Traits
+ */
+trait PathResolverTrait
+{
+    /**
+     * @var callable
+     */
+    protected $pathResolver;
+
+    /**
+     * @param string $path
+     * @return string
+     */
+    public function resolverPath($path)
+    {
+        if (!$this->pathResolver) {
+            return $path;
+        }
+
+        return Php::call($this->pathResolver, $path);
+    }
+
+    /**
+     * @return callable
+     */
+    public function getPathResolver(): callable
+    {
+        return $this->pathResolver;
+    }
+
+    /**
+     * @param callable $pathResolver
+     */
+    public function setPathResolver(callable $pathResolver)
+    {
+        $this->pathResolver = $pathResolver;
+    }
+}