Merge pull request #5 from TheDragonCode/3.x

Andrey Helldar · web-flow · commit 9b7d395b3e94 · 2021-11-14T17:23:29.000+03:00
Changed namespace
diff --git a/.editorconfig b/.editorconfig
diff --git a/README.md b/README.md
@@ -1,26 +1,19 @@
 # Laravel Support
 
-Various helper files for the Laravel and Lumen frameworks.
-
 <img src="https://preview.dragon-code.pro/TheDragonCode/laravel-support.svg?brand=laravel" alt="Laravel Support"/>
 
 <p align="center">
     <a href="https://styleci.io/repos/258101736"><img src="https://styleci.io/repos/258101736/shield" alt="StyleCI" /></a>
-    <a href="https://packagist.org/packages/andrey-helldar/laravel-support"><img src="https://img.shields.io/packagist/dt/andrey-helldar/laravel-support.svg?style=flat-square" alt="Total Downloads" /></a>
-    <a href="https://packagist.org/packages/andrey-helldar/laravel-support"><img src="https://poser.pugx.org/andrey-helldar/laravel-support/v/stable?format=flat-square" alt="Latest Stable Version" /></a>
-    <a href="https://packagist.org/packages/andrey-helldar/laravel-support"><img src="https://poser.pugx.org/andrey-helldar/laravel-support/v/unstable?format=flat-square" alt="Latest Unstable Version" /></a>
-    <a href="https://travis-ci.org/andrey-helldar/laravel-support"><img src="https://travis-ci.org/andrey-helldar/laravel-support.svg?branch=master" alt="Travis CI" /></a>
-    <a href="LICENSE"><img src="https://poser.pugx.org/andrey-helldar/laravel-support/license?format=flat-square" alt="License" /></a>
+    <a href="https://packagist.org/packages/dragon-code/laravel-support"><img src="https://img.shields.io/packagist/dt/dragon-code/laravel-support.svg?style=flat-square" alt="Total Downloads" /></a>
+    <a href="https://packagist.org/packages/dragon-code/laravel-support"><img src="https://poser.pugx.org/dragon-code/laravel-support/v/stable?format=flat-square" alt="Latest Stable Version" /></a>
+    <a href="https://packagist.org/packages/dragon-code/laravel-support"><img src="https://poser.pugx.org/dragon-code/laravel-support/v/unstable?format=flat-square" alt="Latest Unstable Version" /></a>
+    <a href="https://travis-ci.org/dragon-code/laravel-support"><img src="https://travis-ci.org/dragon-code/laravel-support.svg?branch=master" alt="Travis CI" /></a>
+    <a href="LICENSE"><img src="https://poser.pugx.org/dragon-code/laravel-support/license?format=flat-square" alt="License" /></a>
 </p>
 
+> Various helper files for the Laravel and Lumen frameworks.
+
 
 ## License
 
 This package is licensed under the [MIT License](LICENSE).
-
-
-## For Enterprise
-
-Available as part of the Tidelift Subscription.
-
-The maintainers of `andrey-helldar/laravel-support` and thousands of other packages are working with Tidelift to deliver commercial support and maintenance for the open source packages you use to build your applications. Save time, reduce risk, and improve code health, while paying the maintainers of the exact packages you use. [Learn more](https://tidelift.com/subscription/pkg/packagist-andrey-helldar-laravel-support?utm_source=packagist-andrey-helldar-laravel-support&utm_medium=referral&utm_campaign=enterprise&utm_term=repo).
diff --git a/SECURITY.md b/SECURITY.md
diff --git a/composer.json b/composer.json
@@ -1,12 +1,12 @@
 {
-    "name": "andrey-helldar/laravel-support",
+    "name": "dragon-code/laravel-support",
     "description": "Various helper files for the Laravel and Lumen frameworks",
     "type": "library",
     "license": "MIT",
-    "keywords": ["support", "laravel", "lumen", "framework"],
+    "keywords": ["support", "laravel", "lumen", "framework", "dragon-code", "dragon", "andrey-helldar"],
     "support": {
-        "issues": "https://github.com/andrey-helldar/laravel-support/issues",
-        "source": "https://github.com/andrey-helldar/laravel-support"
+        "issues": "https://github.com/TheDragonCode/laravel-support/issues",
+        "source": "https://github.com/TheDragonCode/laravel-support"
     },
     "authors": [
         {
@@ -16,16 +16,16 @@
     ],
     "require": {
         "php": "^7.2|^8.0",
-        "illuminate/container": "^5.0|^6.0|^7.0|^8.0",
-        "illuminate/database": "^5.0|^6.0|^7.0|^8.0",
-        "illuminate/http": "^5.0|^6.0|^7.0|^8.0",
-        "illuminate/support": "^5.0|^6.0|^7.0|^8.0",
+        "illuminate/container": "^6.0|^7.0|^8.0",
+        "illuminate/database": "^6.0|^7.0|^8.0",
+        "illuminate/http": "^6.0|^7.0|^8.0",
+        "illuminate/support": "^6.0|^7.0|^8.0",
         "ramsey/uuid": "^3.7|^4.0",
-        "symfony/var-dumper": "^2.6|^3.0|^4.0|^5.0"
+        "symfony/var-dumper": "^4.0|^5.0"
     },
     "autoload": {
         "psr-4": {
-            "Helldar\\LaravelSupport\\": "src"
+            "DragonCode\\LaravelSupport\\": "src"
         },
         "files": [
             "helpers/dumper.php"
diff --git a/helpers/dumper.php b/helpers/dumper.php
@@ -1,6 +1,6 @@
 <?php
 
-use Helldar\LaravelSupport\Facades\Dumper;
+use DragonCode\LaravelSupport\Facades\Dumper;
 
 if (! function_exists('dd_sql')) {
     /**
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
diff --git a/src/Eloquent/CompositeKeysModel.php b/src/Eloquent/CompositeKeysModel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Helldar\LaravelSupport\Eloquent;
+namespace DragonCode\LaravelSupport\Eloquent;
 
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Database\Eloquent\Model;
diff --git a/src/Eloquent/Concerns/HasCustomRelationships.php b/src/Eloquent/Concerns/HasCustomRelationships.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Helldar\LaravelSupport\Eloquent\Concerns;
+namespace DragonCode\LaravelSupport\Eloquent\Concerns;
 
-use Helldar\LaravelSupport\Eloquent\Relations\HasManyCustomRelation;
+use DragonCode\LaravelSupport\Eloquent\Relations\HasManyCustomRelation;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/src/Eloquent/Relations/HasManyCustomRelation.php b/src/Eloquent/Relations/HasManyCustomRelation.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Helldar\LaravelSupport\Eloquent\Relations;
+namespace DragonCode\LaravelSupport\Eloquent\Relations;
 
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
diff --git a/src/Eloquent/UuidModel.php b/src/Eloquent/UuidModel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Helldar\LaravelSupport\Eloquent;
+namespace DragonCode\LaravelSupport\Eloquent;
 
 use Illuminate\Database\Eloquent\Model;
 use Ramsey\Uuid\Uuid;
diff --git a/src/Exceptions/IncorrectModelException.php b/src/Exceptions/IncorrectModelException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Helldar\LaravelSupport\Exceptions;
+namespace DragonCode\LaravelSupport\Exceptions;
 
 use Exception;
 use Illuminate\Database\Eloquent\Model;
diff --git a/src/Facades/App.php b/src/Facades/App.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace Helldar\LaravelSupport\Facades;
+namespace DragonCode\LaravelSupport\Facades;
 
-use Helldar\LaravelSupport\Support\App as Support;
+use DragonCode\LaravelSupport\Support\App as Support;
 use Illuminate\Support\Facades\Facade;
 
 /**
  * @method static bool isLaravel()
  * @method static bool isLumen()
  */
-final class App extends Facade
+class App extends Facade
 {
-    protected static function getFacadeAccessor()
+    protected static function getFacadeAccessor(): string
     {
         return Support::class;
     }
diff --git a/src/Facades/Dumper.php b/src/Facades/Dumper.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Helldar\LaravelSupport\Facades;
+namespace DragonCode\LaravelSupport\Facades;
 
-use Helldar\LaravelSupport\Support\Dumper as Support;
+use DragonCode\LaravelSupport\Support\Dumper as Support;
 use Illuminate\Support\Facades\Facade;
 
 /**
@@ -12,7 +12,7 @@
  */
 class Dumper extends Facade
 {
-    protected static function getFacadeAccessor()
+    protected static function getFacadeAccessor(): string
     {
         return Support::class;
     }
diff --git a/src/Support/App.php b/src/Support/App.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Helldar\LaravelSupport\Support;
+namespace DragonCode\LaravelSupport\Support;
 
 use Illuminate\Foundation\Application as LaravelApp;
 use Laravel\Lumen\Application as LumenApp;
 
-final class App
+class App
 {
     public function isLaravel(): bool
     {
diff --git a/src/Support/Dumper.php b/src/Support/Dumper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Helldar\LaravelSupport\Support;
+namespace DragonCode\LaravelSupport\Support;
 
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Query\Builder as QueryBuilder;
diff --git a/src/Support/ModelHelper.php b/src/Support/ModelHelper.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Helldar\LaravelSupport\Support;
+namespace DragonCode\LaravelSupport\Support;
 
-use Helldar\LaravelSupport\Exceptions\IncorrectModelException;
+use DragonCode\LaravelSupport\Exceptions\IncorrectModelException;
 use Illuminate\Database\Eloquent\Model;
 
 class ModelHelper
@@ -12,7 +12,7 @@ class ModelHelper
     /**
      * @param  \Illuminate\Database\Eloquent\Model|string  $model
      *
-     * @throws \Helldar\LaravelSupport\Exceptions\IncorrectModelException
+     * @throws \DragonCode\LaravelSupport\Exceptions\IncorrectModelException
      *
      * @return string
      */
@@ -26,7 +26,7 @@ public function connection($model): ?string
     /**
      * @param  \Illuminate\Database\Eloquent\Model|string  $model
      *
-     * @throws \Helldar\LaravelSupport\Exceptions\IncorrectModelException
+     * @throws \DragonCode\LaravelSupport\Exceptions\IncorrectModelException
      *
      * @return string
      */
@@ -40,7 +40,7 @@ public function table($model): string
     /**
      * @param  \Illuminate\Database\Eloquent\Model|string  $model
      *
-     * @throws \Helldar\LaravelSupport\Exceptions\IncorrectModelException
+     * @throws \DragonCode\LaravelSupport\Exceptions\IncorrectModelException
      *
      * @return string
      */
@@ -57,7 +57,7 @@ public function tableWithConnection($model): string
     /**
      * @param  \Illuminate\Database\Eloquent\Model|string  $model
      *
-     * @throws \Helldar\LaravelSupport\Exceptions\IncorrectModelException
+     * @throws \DragonCode\LaravelSupport\Exceptions\IncorrectModelException
      *
      * @return string
      */
@@ -71,7 +71,7 @@ public function primaryKey($model): string
     /**
      * @param  \Illuminate\Database\Eloquent\Model|string  $model
      *
-     * @throws \Helldar\LaravelSupport\Exceptions\IncorrectModelException
+     * @throws \DragonCode\LaravelSupport\Exceptions\IncorrectModelException
      *
      * @return string
      */
@@ -95,7 +95,7 @@ public function className($model): string
     /**
      * @param  \Illuminate\Database\Eloquent\Model|string  $model
      *
-     * @throws \Helldar\LaravelSupport\Exceptions\IncorrectModelException
+     * @throws \DragonCode\LaravelSupport\Exceptions\IncorrectModelException
      *
      * @return array
      */
@@ -110,7 +110,7 @@ public function fillable($model): array
      * @param  \Illuminate\Database\Eloquent\Model|string  $model
      * @param  \Illuminate\Http\Request  $request
      *
-     * @throws \Helldar\LaravelSupport\Exceptions\IncorrectModelException
+     * @throws \DragonCode\LaravelSupport\Exceptions\IncorrectModelException
      *
      * @return array
      */
diff --git a/src/Traits/InitModelHelper.php b/src/Traits/InitModelHelper.php
@@ -1,27 +1,26 @@
 <?php
 
-namespace Helldar\LaravelSupport\Traits;
+namespace DragonCode\LaravelSupport\Traits;
 
-use Helldar\LaravelSupport\Support\ModelHelper;
+use DragonCode\LaravelSupport\Support\ModelHelper;
 use Illuminate\Container\Container;
 
 trait InitModelHelper
 {
-    /** @var \Helldar\LaravelSupport\Support\ModelHelper */
+    /** @var \DragonCode\LaravelSupport\Support\ModelHelper */
     protected static $model_helper;
 
     /**
      * @throws \Illuminate\Contracts\Container\BindingResolutionException
      *
-     * @return \Helldar\LaravelSupport\Support\ModelHelper
+     * @return \DragonCode\LaravelSupport\Support\ModelHelper
      */
     protected function model(): ModelHelper
     {
-        if (static::$model_helper === null) {
-            static::$model_helper = Container::getInstance()
-                ->make(ModelHelper::class);
+        if (static::$model_helper) {
+            return static::$model_helper;
         }
 
-        return static::$model_helper;
+        return static::$model_helper = Container::getInstance()->make(ModelHelper::class);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,17 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace Helldar\LaravelSupport\Facades;`
	`3`	`+namespace DragonCode\LaravelSupport\Facades;`
`4`	`4`
`5`		`-use Helldar\LaravelSupport\Support\App as Support;`
	`5`	`+use DragonCode\LaravelSupport\Support\App as Support;`
`6`	`6`	`use Illuminate\Support\Facades\Facade;`
`7`	`7`
`8`	`8`	`/**`
`9`	`9`	`* @method static bool isLaravel()`
`10`	`10`	`* @method static bool isLumen()`
`11`	`11`	`*/`
`12`		`-final class App extends Facade`
	`12`	`+class App extends Facade`
`13`	`13`	`{`
`14`		`- protected static function getFacadeAccessor()`
	`14`	`+ protected static function getFacadeAccessor(): string`
`15`	`15`	`{`
`16`	`16`	`return Support::class;`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace Helldar\LaravelSupport\Facades;`
	`3`	`+namespace DragonCode\LaravelSupport\Facades;`
`4`	`4`
`5`		`-use Helldar\LaravelSupport\Support\Dumper as Support;`
	`5`	`+use DragonCode\LaravelSupport\Support\Dumper as Support;`
`6`	`6`	`use Illuminate\Support\Facades\Facade;`
`7`	`7`
`8`	`8`	`/**`
`@@ -12,7 +12,7 @@`
`12`	`12`	`*/`
`13`	`13`	`class Dumper extends Facade`
`14`	`14`	`{`
`15`		`- protected static function getFacadeAccessor()`
	`15`	`+ protected static function getFacadeAccessor(): string`
`16`	`16`	`{`
`17`	`17`	`return Support::class;`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace Helldar\LaravelSupport\Support;`
	`3`	`+namespace DragonCode\LaravelSupport\Support;`
`4`	`4`
`5`	`5`	`use Illuminate\Foundation\Application as LaravelApp;`
`6`	`6`	`use Laravel\Lumen\Application as LumenApp;`
`7`	`7`
`8`		`-final class App`
	`8`	`+class App`
`9`	`9`	`{`
`10`	`10`	`public function isLaravel(): bool`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,27 +1,26 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace Helldar\LaravelSupport\Traits;`
	`3`	`+namespace DragonCode\LaravelSupport\Traits;`
`4`	`4`
`5`		`-use Helldar\LaravelSupport\Support\ModelHelper;`
	`5`	`+use DragonCode\LaravelSupport\Support\ModelHelper;`
`6`	`6`	`use Illuminate\Container\Container;`
`7`	`7`
`8`	`8`	`trait InitModelHelper`
`9`	`9`	`{`
`10`		`- /** @var \Helldar\LaravelSupport\Support\ModelHelper */`
	`10`	`+ /** @var \DragonCode\LaravelSupport\Support\ModelHelper */`
`11`	`11`	`protected static $model_helper;`
`12`	`12`
`13`	`13`	`/**`
`14`	`14`	`* @throws \Illuminate\Contracts\Container\BindingResolutionException`
`15`	`15`	`*`
`16`		`- * @return \Helldar\LaravelSupport\Support\ModelHelper`
	`16`	`+ * @return \DragonCode\LaravelSupport\Support\ModelHelper`
`17`	`17`	`*/`
`18`	`18`	`protected function model(): ModelHelper`
`19`	`19`	`{`
`20`		`- if (static::$model_helper === null) {`
`21`		`- static::$model_helper = Container::getInstance()`
`22`		`- ->make(ModelHelper::class);`
	`20`	`+ if (static::$model_helper) {`
	`21`	`+ return static::$model_helper;`
`23`	`22`	`}`
`24`	`23`
`25`		`- return static::$model_helper;`
	`24`	`+ return static::$model_helper = Container::getInstance()->make(ModelHelper::class);`
`26`	`25`	`}`
`27`	`26`	`}`