up

Author: inhere

src/Helpers/DateHelper.php

@@ -60,6 +60,24 @@ public static function isDateFormat($date, $format = 'Y-m-d')
         return false;
     }
 
+    /**
+     * @return int
+     */
+    public static function todayStart()
+    {
+//        return strtotime(date('Y-m-d 00:00:00'));
+        return strtotime('today 00:00:00');
+    }
+
+    /**
+     * @return int
+     */
+    public static function todayEnd()
+    {
+//        return strtotime(date('Y-m-d 23:59:59'));
+        return strtotime('today 23:59:59');
+    }
+
     /**
      * @return false|int
      */
@@ -68,6 +86,21 @@ public static function tomorrowBegin()
         return mktime(0, 0, 0, date('m'), date('d') + 1, date('Y'));
     }
 
+    /**
+     * @return int
+     */
+    public static function tomorrowStart()
+    {
+        return strtotime('+1 day 00:00:00');
+    }
+
+    /**
+     * @return int
+     */
+    public static function tomorrowEnd()
+    {
+        return strtotime('+1 day 23:59:59');
+    }
     /**
      * @return false|int
      */

src/Traits/LogProfileTrait.php

@@ -24,6 +24,9 @@ trait LogProfileTrait
      */
     private $profiles = [];
 
+    /** @var string e.g 'application|request' */
+    private $activeKey;
+
     /**
      * mark data analysis start
      * @param $name
@@ -41,18 +44,23 @@ public function profile($name, array $context = [], $category = 'application')
             '_profile_end' => null,
         ];
 
+        $this->activeKey = $category . '|' . $name;
         $this->profiles[$category][$name] = $data;
     }
 
     /**
      * mark data analysis end
-     * @param string $name
      * @param string|null $title
      * @param array $context
-     * @param string $category
      */
-    public function profileEnd($name, $title = null, array $context = [], $category = 'application')
+    public function profileEnd($title = null, array $context = [])
     {
+        if (!$this->activeKey) {
+            return;
+        }
+
+        list($category, $name) = explode('|', $this->activeKey);
+
         if (isset($this->profiles[$category][$name])) {
             $data = $this->profiles[$category][$name];
 
@@ -62,8 +70,9 @@ public function profileEnd($name, $title = null, array $context = [], $category
 
             $title = $category . ' - ' . ($title ?: $name);
 
+            $this->activeKey = null;
             $this->log(Logger::DEBUG, $title, $data);
         }
     }
 
-}
+}

src/Traits/LogShortTrait.php

@@ -139,10 +139,12 @@ public static function debug($message, array $context = array())
      */
     public static function trace($message, array $context = array())
     {
-        $tce = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
+        if (!isset($context['_called_at'])) {
+            $tce = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
 
-        if ($info = $tce[1] ?? null) {
-            $context['_called_at'] = sprintf('%s::%s Line %d', $info['class'], $info['function'], $tce[0]['line']);
+            if ($info = $tce[1] ?? null) {
+                $context['_called_at'] = sprintf('%s::%s Line %d', $info['class'], $info['function'], $tce[0]['line']);
+            }
         }
 
         $context['_stats'] = PhpHelper::runtime(Req::server('request_time_float'), Req::server('request_memory'));

src/Utils/LiteLogger.php

@@ -283,20 +283,16 @@ public function trace($message = '', array $context = [])
 
         if (!isset($context['_called_at'])) {
             $file = $method = $line = 'Unknown';
+            $data = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
 
-            if ($data = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2)) {
-                if (isset($data[0])) {
-                    $file = $data[0]['file'];
-                    $line = $data[0]['line'];
-                }
-
-                if (isset($data[1])) {
-                    $t = $data[1];
-                    $method = Arr::remove($t, 'class', 'CLASS') . '::' . Arr::remove($t, 'function', 'METHOD');
-                }
+            if (isset($data[1])) {
+                $file = $data[0]['file'];
+                $line = $data[0]['line'];
+                $t = $data[1];
+                $method = Arr::remove($t, 'class', 'CLASS') . '::' . Arr::remove($t, 'function', 'METHOD');
             }
 
-            $context['_called_at'] = "$method File $file line $line";
+            $context['_called_at'] = "$method, On $file line $line";
         }
 
         $this->log(self::TRACE, $message, $context);