reconstitution

Author: w3yyb

lib/Arr.php AmazePHP/src/Arr.php

@@ -1,5 +1,5 @@
 <?php
-
+namespace AmazePHP;
 
 use ArrayAccess as ArrayAccess;
 use InvalidArgumentException as InvalidArgumentException;

lib/ArraySessionHandler.php AmazePHP/src/ArraySessionHandler.php

@@ -1,4 +1,5 @@
 <?php
+namespace AmazePHP;
 
 use SessionHandlerInterface;
 

lib/Cache.php AmazePHP/src/Cache.php

@@ -1,4 +1,5 @@
 <?php
+namespace AmazePHP;
 
 use eftec\CacheOne;
 

lib/ConfigRepository.php AmazePHP/src/ConfigRepository.php

@@ -1,8 +1,9 @@
 <?php
 
+namespace AmazePHP;
 
 use ArrayAccess as ArrayAccess;
-use Arr as Arr;
+// use Arr as Arr;
 
 class ConfigRepository implements ArrayAccess
 {

lib/CookieValuePrefix.php AmazePHP/src/CookieValuePrefix.php

@@ -1,4 +1,5 @@
 <?php
+namespace AmazePHP;
 
 
 class CookieValuePrefix

lib/DB.php AmazePHP/src/DB.php

@@ -1,4 +1,5 @@
 <?php
+namespace AmazePHP;
 
 use eftec\PdoOne;
 

lib/DotEnv.php AmazePHP/src/DotEnv.php

@@ -1,4 +1,5 @@
 <?php
+namespace AmazePHP;
 
 class DotEnv
 {

lib/ErrorHandel.php AmazePHP/src/ErrorHandel.php

@@ -1,4 +1,5 @@
 <?php
+namespace AmazePHP;
 
 // use Monolog\Level;
 // use Monolog\Logger;
@@ -121,7 +122,7 @@ public function exceptionHandler($exception)
     public function errorHandler($severity, $message, $file, $line)
     {
         $full_msg=$message . "  at  Line:" . $line . "  in   File:" . $file;
-        throw new ErrorException($this->friendlyErrorType($full_msg, $severity) . ":" . $message, 0, $severity, $file, $line);
+        throw new \ErrorException($this->friendlyErrorType($full_msg, $severity) . ":" . $message, 0, $severity, $file, $line);
     }
 
     public function friendlyErrorType($error, $type)

lib/FileSessionHandler.php AmazePHP/src/FileSessionHandler.php

@@ -1,4 +1,5 @@
 <?php
+namespace AmazePHP;
 
 /**
  * Class FileSessionHandler

lib/InteractsWithTime.php AmazePHP/src/InteractsWithTime.php

@@ -1,5 +1,6 @@
 <?php
 
+namespace AmazePHP;
 
 use DateInterval as DateInterval;
 use DateTimeInterface as DateTimeInterface;

lib/LoadConfiguration.php AmazePHP/src/LoadConfiguration.php

@@ -1,5 +1,6 @@
 <?php
 
+namespace AmazePHP;
 
 
 use Exception as Exception;
@@ -43,7 +44,7 @@ public function __construct( )
         $this->repo=$repository = new ConfigRepository($items);
 
 
-        $config_path = __DIR__ . '/../config';
+        $config_path = BASE_PATH . '/config';
 
         if (! isset($loadedFromCache)) {
             $this->loadConfigurationFiles($config_path, $repository);

lib/Log.php AmazePHP/src/Log.php

@@ -1,4 +1,5 @@
 <?php
+namespace AmazePHP;
 
 
 use Monolog\Logger as Logger;

app/Middleware/MiddlewareInterface.php AmazePHP/src/MiddlewareInterface.php

@@ -1,5 +1,6 @@
 <?php
-namespace App\Middleware;
+namespace AmazePHP;
+
 
 use \Closure as Closure;
 

lib/Mysql.php AmazePHP/src/Mysql.php

@@ -1,4 +1,6 @@
 <?php
+namespace AmazePHP;
+
 /**
 *mysql数据库类
 * leninx 2013.5

lib/NullSessionHandler.php AmazePHP/src/NullSessionHandler.php

@@ -1,5 +1,6 @@
 <?php
 
+namespace AmazePHP;
 
 
 use SessionHandlerInterface;

app/Pipeline.php AmazePHP/src/Pipeline.php

@@ -1,5 +1,6 @@
 <?php
-namespace App;
+namespace AmazePHP;
+
 
 use InvalidArgumentException as InvalidArgumentException ;
 use Closure as Closure;

lib/RedisSessionHandler.php AmazePHP/src/RedisSessionHandler.php

@@ -1,4 +1,5 @@
 <?php
+namespace AmazePHP;
 
 /**
  * Class RedisSessionHandler

app/Request.php AmazePHP/src/Request.php

@@ -1,5 +1,6 @@
 <?php
-namespace App;
+namespace AmazePHP;
+
 
 // use WondPHP\Http\UploadFile;
 // use Symfony\Component\HttpFoundation\AcceptHeader;
@@ -12,7 +13,7 @@
  */
 class Request  
 {
-    use \SingletonTrait;
+    use SingletonTrait;
 
 
     public const HEADER_FORWARDED = 0b000001; // When using RFC 7239

lib/Router.php AmazePHP/src/Router.php

@@ -1,4 +1,5 @@
 <?php
+namespace AmazePHP;
 
 class Router
 {
@@ -67,9 +68,9 @@ public function doRouting()
                     throw new Exception("405 Not Allowed");
                 }
 
-                $request = App\Request::getInstance();
+                $request =  Request::getInstance();
 
-                return    (new App\Pipeline())->through($route['middleware'])
+                return    (new  Pipeline())->through($route['middleware'])
                 ->then($request, function () use ($route, $matches) {
                     echo  call_user_func_array($route['callback'], $matches);
                 });

lib/Session.php AmazePHP/src/Session.php

@@ -1,5 +1,6 @@
 <?php
-
+namespace AmazePHP;
+use AmazePHP\FileSessionHandler;
 /**
  * Class Session
  *

lib/SingletonTrait.php AmazePHP/src/SingletonTrait.php

@@ -1,4 +1,5 @@
 <?php
+namespace AmazePHP;
 
 /**
  * Singleton

lib/Str.php AmazePHP/src/Str.php

@@ -1,4 +1,5 @@
 <?php
+namespace AmazePHP;
 
 
 use Closure as Closure;
@@ -21,7 +22,7 @@
 
 class Str
 {
-    use Spatie\Macroable\Macroable;
+    use \Spatie\Macroable\Macroable;
 
     /**
      * The cache of snake-cased words.

app/UploadFile.php AmazePHP/src/UploadFile.php

@@ -1,6 +1,7 @@
 <?php
 
-namespace App;
+namespace AmazePHP;
+
 
 /**
  * Class UploadFile
@@ -52,10 +53,10 @@ public function __construct($file_name, $upload_name, $upload_mime_type, $upload
 
         $this->fileSize =  $size;
         if ($this->fileSize > $this->maxSize) {
-            exit("文件超过".($this->maxSize / 1024 / 1024)." M大小");
+            exit("file max than".($this->maxSize / 1024 / 1024)." M");
         }
         if ($this->_uploadErrorCode > 0) {
-            exit($error);
+            exit($error ?? 'no file upload');
         }
         if ($upType== "image") {
             $this->checkImage();

lib/UrlGenerator.php AmazePHP/src/UrlGenerator.php

@@ -1,4 +1,5 @@
 <?php
+namespace AmazePHP;
 
 
 class UrlGenerator

lib/VerifyCsrfToken.php AmazePHP/src/VerifyCsrfToken.php

@@ -1,4 +1,5 @@
 <?php
+namespace AmazePHP;
 
 
 use Illuminate\Contracts\Encryption\DecryptException;

App.php

@@ -1,10 +1,11 @@
 <?php
-
+use AmazePHP\Router;
+use AmazePHP\VerifyCsrfToken;
 define('BASE_PATH', __DIR__);
-include 'lib/DotEnv.php';
-include 'lib/ErrorHandel.php';
-(new DotEnv());
-(new ErrorHandel());
+include 'AmazePHP/src/DotEnv.php';
+include 'AmazePHP/src/ErrorHandel.php';
+(new AmazePHP\DotEnv());
+(new AmazePHP\ErrorHandel());
 
 include 'vendor/autoload.php';
 
@@ -25,12 +26,12 @@
     $router->addRoute($value[0][0], $value[1], $value[2], $value[3] ?? null, $value['middleware'] ?? []);
 }
 
-$request = App\Request::getInstance();
+$request = AmazePHP\Request::getInstance();
 
 
 $middleware =require BASE_PATH.'/config/middleware.php';
 
-return    (new App\Pipeline())->through($middleware)
+return    (new AmazePHP\Pipeline())->through($middleware)
 ->then($request ,function () use ($router) {
     $response =$router->doRouting();
     if ($response !== null) {

README.md

@@ -147,11 +147,7 @@ if (request()->is('admin/*')) {
 
 $input = request()->only(['username', 'password']);
  
-$input = request()t->only('username', 'password');
- 
 $input = request()->except(['credit_card']);
- 
-$input = request()->except('credit_card');
 
   $file = request()->file('upload');
         if ($file && $file->isValid()) {

app/Middleware/a2Middleware.php

@@ -1,5 +1,7 @@
 <?php
 namespace App\Middleware;
+use AmazePHP\MiddlewareInterface;
+
 
 class a2Middleware implements MiddlewareInterface {
 

app/Middleware/aMiddleware.php

@@ -1,5 +1,6 @@
 <?php
 namespace App\Middleware;
+use AmazePHP\MiddlewareInterface;
 
 class aMiddleware implements MiddlewareInterface {
 

app/Middleware/b2Middleware.php

@@ -1,5 +1,6 @@
 <?php
 namespace App\Middleware;
+use AmazePHP\MiddlewareInterface;
 
 class b2Middleware implements MiddlewareInterface {
 

app/Middleware/bMiddleware.php

@@ -1,5 +1,7 @@
 <?php
 namespace App\Middleware;
+use AmazePHP\MiddlewareInterface;
+
 
 class bMiddleware implements MiddlewareInterface {
 

composer.json

@@ -17,15 +17,13 @@
       "spatie/macroable": "^2.0",
       "eftec/cacheone": "^2.16",
       "eftec/pdoone": "^4.2",
-    "doctrine/event-manager": "^2.0"
+      "doctrine/event-manager": "^2.0"
   },
   "autoload": {
       "psr-4": {
-          "App\\": "app"
+          "App\\": "app",
+          "AmazePHP\\": "AmazePHP/src/"
       },
-      "classmap": [
-          "lib"
-      ],
       "files": [
           "helper/functions.php"
       ]

config/session.php

@@ -1,6 +1,6 @@
 <?php
 
-
+use AmazePHP\FileSessionHandler;
 return [
 
 

helper/functions.php

@@ -1,7 +1,15 @@
 <?php
 
 use eftec\bladeone\BladeOne;
-
+use AmazePHP\Log;
+use AmazePHP\LoadConfiguration;
+use AmazePHP\Cache;
+use AmazePHP\DotEnv;
+use AmazePHP\Request;
+use AmazePHP\DB;
+use AmazePHP\Session;
+use AmazePHP\UrlGenerator;
+use AmazePHP\Router;
 function env($key, $default = null)
 {
     $apcu_key="env$key";
@@ -66,7 +74,7 @@ function value($value, ...$args)
 
 function request()
 {
-    return App\Request::getInstance();
+    return Request::getInstance();
 }
 
 function view($view = null, $data = [])

public/favicon.ico

@@ -9,8 +9,8 @@ public function testSelect(): void
             define('BASE_PATH', __DIR__ . '/..');
 
         }
-        include_once 'lib/DotEnv.php';
-        (new DotEnv());
+        include_once 'AmazePHP/src/DotEnv.php';
+        (new \AmazePHP\DotEnv());
         $string = 'test1';
 
         $email = $results = db()->select("*")->from('users')->where("name like '%test%'")->toList()[0]['name'];
@@ -25,8 +25,8 @@ public function testInsert(): void
             define('BASE_PATH', __DIR__ . '/..');
 
         }
-        include_once 'lib/DotEnv.php';
-        (new DotEnv());
+        include_once 'AmazePHP/src/DotEnv.php';
+        (new \AmazePHP\DotEnv());
 
         db()->insert("users"
     ,['name','email','password']