Merge pull request #12 from OnrampLab/11-feat-override-log-singleton

Finish: override log singleton

Close #11

Author: koshuang

.circleci/config.yml

@@ -7,11 +7,6 @@ commands:
       - checkout
       - restore_cache:
           key: dependency-cache-composer-{{ checksum "composer.json" }}
-      - run:
-          name: Install php extensions
-          command: |
-            sudo docker-php-ext-configure pdo_mysql --with-pdo-mysql=mysqlnd
-            sudo docker-php-ext-install pcntl pdo_mysql
       - run:
           name: Install composer packages
           command: |
@@ -33,7 +28,7 @@ jobs:
   run_test:
     working_directory: ~/app
     docker:
-      - image: circleci/php:7.4.3
+      - image: cimg/php:7.4.26
     steps:
       - run_test
 

README.md

@@ -6,7 +6,7 @@
 
 A library with logging enhancement. Including:
 
-- `LoggerFacade` facade
+- Overriding `Log` facade
   - It extends default Laravel `Log` facade with logging adding class path and tracking id into context.
 - `LogglyHandler` class
   - It extends monolog's LogglyHandler with tags support
@@ -21,12 +21,6 @@ composer require onramplab/laravel-log-enhancement
 
 ### LoggerFacade
 
-Replace the class of `Log` alias to `LoggerFacade` in `config/app.php` as aliases.
-
-```php
-'Log' => Onramplab\LaravelLogEnhancement\Facades\LoggerFacade::class,
-```
-
 The log json will look like this:
 
 ```json

composer.json

@@ -11,7 +11,7 @@
         }
     ],
     "minimum-stability": "dev",
-    "prefer-stable":true,
+    "prefer-stable": true,
     "require": {
         "monolog/monolog": "^1.12|^2.0",
         "ramsey/uuid": "^4.0.0"
@@ -22,9 +22,10 @@
         "illuminate/log": "^7.0",
         "illuminate/support": "^7.0",
         "mockery/mockery": "^1.3.2",
+        "nunomaduro/larastan": "^1.0",
         "orchestra/database": "^5.0",
         "orchestra/testbench": "^5.0",
-        "phpstan/phpstan": "^0.12.64",
+        "phpstan/phpstan": "^1.7",
         "phpunit/phpunit": "^8.0",
         "sempro/phpunit-pretty-print": "1.2.2",
         "symfony/thanks": "^1.0"
@@ -36,12 +37,15 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Onramplab\\LaravelLogEnhancement\\Tests\\":"tests/"
+            "Onramplab\\LaravelLogEnhancement\\Tests\\": "tests/"
         }
     },
     "config": {
         "preferred-install": "dist",
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "symfony/thanks": true
+        }
     },
     "scripts": {
         "test": "vendor/bin/phpunit",
@@ -51,10 +55,7 @@
         "laravel": {
             "providers": [
                 "Onramplab\\LaravelLogEnhancement\\LaravelLogEnhancementServiceProvider"
-            ],
-            "aliases": {
-                "Onramplab": "Onramplab\\LaravelLogEnhancement\\LaravelLogEnhancementFacade"
-            }
+            ]
         }
     }
 }

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.4'
 
 services:
-  php7:
-    image: thecodingmachine/php:7.3-v3-slim-apache
+  php:
+    image: thecodingmachine/php:7.4-v4-slim-apache
     volumes:
       - ./:/var/www/html

phpstan.neon

@@ -12,7 +12,7 @@ parameters:
     # ignoreErrors:
     #    - '#Unsafe usage of new static#'
 
-    excludes_analyse:
+    excludePaths:
         - ./*/*/Tests/*.php
         - ./*/*/factories/*.php
         - ./*/*/Migrations/*.php

src/Facades/LoggerFacade.php

@@ -60,16 +60,16 @@ private function routeConfiguration()
      */
     public function register()
     {
-        $this->app->singleton('laravel-log-enhancement-logger', function (Application $app) {
+        $this->app->singleton('log', function (Application $app) {
             return new LogManager($app);
         });
     }
 
     public function registerHooks()
     {
         Queue::before(function () {
-            $this->app->forgetInstance('laravel-log-enhancement-logger');
-            Facade::clearResolvedInstance('laravel-log-enhancement-logger');
+            $this->app->forgetInstance('log');
+            Facade::clearResolvedInstance('log');
         });
     }