Merge to master

.github/workflows/tests.yml

@@ -7,13 +7,14 @@ env:
   FTP_USER: username
   FTP_PASSWORD: password
   FTP_PORT: 21
+  FTP_ROOT: /tmp
 
 jobs:
   lunix-tests:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        php: [8.1, 8.2]
+        php: [8.1, 8.2, 8.3]
         os: [ubuntu-latest]
         stability: [prefer-lowest, prefer-stable]
 
@@ -41,11 +42,11 @@ jobs:
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, mysql, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, redis
           coverage: none
 
-      - run: docker run --net=host -p 21:21 -e USER=$FTP_USER -e PASS=$FTP_PASSWORD -d --name ftp -v $(pwd)/:/ftp/$FTP_USER emilybache/vsftpd-server
+      - run: docker run -p 21:21 -p 20:20 -p 12020:12020 -p 12021:12021 -p 12022:12022 -p 12023:12023 -p 12024:12024 -p 12025:12025 -e USER=$FTP_USER -e PASS=$FTP_PASSWORD -d --name ftp papacdev/vsftpd
       - run: docker run -p 1080:1080 -p 1025:1025 -d --name maildev soulteary/maildev
       - run: docker run -p 6379:6379 -d --name redis redis
       - run: docker run -p 5432:5432 --name postgres -e POSTGRES_PASSWORD=postgres -e POSTGRES_DB=postgres -e POSTGRES_PASSWORD=postgres -d postgis/postgis
-      - run: docker run -d -p 11301:11300 schickling/beanstalkd
+      - run: docker run -d -p 11300:11300 schickling/beanstalkd
 
       - name: Cache Composer packages
         id: composer-cache
@@ -57,13 +58,13 @@ jobs:
             ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
 
       - name: Copy the php ini config
-        run: cp php.dist.ini php.ini
+        run: sudo cp php.dist.ini php.ini
 
       - name: Install dependencies
-        run: composer update --prefer-dist --no-interaction
+        run: sudo composer update --prefer-dist --no-interaction
 
       - name: Create test cache directory
         run: if [ ! -d /tmp/bowphp_testing ]; then mkdir -p /tmp/bowphp_testing; fi;
 
       - name: Run test suite
-        run: composer run-script test
+        run: sudo composer run-script test

CHANGELOG.md

@@ -5,7 +5,134 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## 5.1.7 - 2024-12-21
+
+### What's Changed
+
+* Update CHANGELOG by @papac in https://github.com/bowphp/framework/pull/305
+* feat(barry): add relative create method for barry model by @papac in https://github.com/bowphp/framework/pull/306
+
+**Full Changelog**: https://github.com/bowphp/framework/compare/5.1.6...5.1.7
+
+## 5.1.6 - 2024-12-20
+
+### What's Changed
+
+* Implement feature for improve http and str classes by @papac in https://github.com/bowphp/framework/pull/304
+
+**Full Changelog**: https://github.com/bowphp/framework/compare/5.1.5...5.1.6
+
+## 5.1.2 - 2023-09-17
+
+Fix `db_seed` helper
+
+Ref
+
+- #257
+- #256
+
+## 5.1.1 - 2023-08-21
+
+Add the transaction method
+
+This method aims to execute an SQL transaction around a passed arrow function.
+
+```php
+Database::transaction(fn() => $user->update(['name' => '']));
+
+
+
+
+```
+Ref: #255
+
+## 5.1.0 - 2023-06-07
+
+Release 5.1.0
+
+- Add custom adaptor #252
+- Make Redis accessible on whole project #250
+
+## 5.0.9 - 2023-06-01
+
+Release 5.0.9
+
+Fixes many bugs
+
+Reference #248
+
+## 5.0.8 - 2023-05-24
+
+Release 5.0.8
+
+Fixes test case errors
+
+Reference #243
+From #242
+
+## 5.0.7 - 2023-05-24
+
+Release 5.0.7
+
+- Fixes the database relationship
+- Fixes the HTTP client
+- Fixes the JWT authentication service
+
+Fixes #241
+Fixes #213
+Fixes #240
+
+## 5.0.6 - 2023-05-22
+
+Release 5.0.6
+
+- Fixes get last insert id for pgsql
+- Add data validation custom message parser
+- Fixes PgSQL migration errors
+- Fixes initialize the request ID #236
+
+References
+
+- Validation and PgSQL #237
+- Many bugs fixes #237
+
+## 5.0.5 - 2023-05-20
+
+Release 5.0.5
+
+- Fix migration status table definition
+- Fix enum creation for pgsql
+
+Reference #232
+
+## 5.0.4 - 2023-05-19
+
+Release 5.0.4
+
+- Fixes HTTP Client
+- Add variable binding to the env loader
+- Fixes validation for regex rule
+- Fixes request data parser
+- Fixes middleware execution order
+
+All update ref #230
+
+## 5.0.3 - 2023-05-16
+
+Add many fixes
+
+- Fixes the error handler
+- Fixes the HTTP client
+- Fixes TestCase service
+
+## 5.0.2 - 2023-05-16
+
+Release for 5.0.2
+
+- Fix action dependency injector
+- Add the base error handler
+
+## 5.0.0 - 2023-05-10
 
 - [Add] Convert the project from PHP7 to PHP8
 - [Add] Multiconnection for storage system

composer.json

@@ -12,29 +12,21 @@
         "bowphp/tintin": "^3.0",
         "filp/whoops": "^2.1",
         "nesbot/carbon": "^2.16",
-        "psy/psysh": "v0.10.*",
+        "psy/psysh": "v0.12.*",
         "fakerphp/faker": "^1.20",
         "neitanod/forceutf8": "^2.0",
-        "ext-openssl": "*",
-        "ext-intl": "*",
-        "ext-pdo": "*",
-        "ext-mbstring": "*",
-        "ext-xml": "*",
-        "ext-json": "*",
-        "ext-pdo_mysql": "*",
-        "ext-pdo_sqlite": "*",
-        "ext-redis": "*"
+        "ramsey/uuid": "^4.7"
     },
     "require-dev": {
-        "pda/pheanstalk": "^4.0",
-        "phpunit/phpunit": "^8",
+        "pda/pheanstalk": "^4.0.5",
+        "phpunit/phpunit": "^9",
         "monolog/monolog": "^1.22",
-        "twig/twig": "^2.5",
+        "twig/twig": "^3",
         "squizlabs/php_codesniffer": "3.*",
         "aws/aws-sdk-php": "^3.87",
         "phpstan/phpstan": "^0.12.87",
         "php-amqplib/php-amqplib": "^3.0",
-        "bowphp/policier": "dev-master",
+        "bowphp/policier": "^3.0",
         "mockery/mockery": "^1.5",
         "spatie/phpunit-snapshot-assertions": "^4.2",
         "predis/predis": "^2.1"

readme.md

@@ -8,7 +8,7 @@ To use this package, please create an application from this package [bowphp/app]
 
 ## The Framework Main Feature
 
-- Full Featured database classes with support for several platforms.
+- Full-featured database classes with support for several platforms.
 - Query Builder Database Support
 - Form and Data Validation
 - Security and XSS Filtering
@@ -21,10 +21,10 @@ To use this package, please create an application from this package [bowphp/app]
 - Pagination
 - CQRS helpful implementation
 - File System Management with many drivers like S3 and FTP (Support connection switch)
-- Extensible with an external package that can plug-in
+- Extensible with an external package that can plug in
 - Application logs Management
 - Database Connection (MySQL, SQLite, PostgreSQL)
-- Simplest ORM which names Barry
+- Simplest ORM which is named Barry
 - Cache support (Filesystem, Redis, Database caching)
 - Event Management (Interpage Event)
 - Emailing (SMTP, SES, Native PHP mail supports)
@@ -34,6 +34,7 @@ To use this package, please create an application from this package [bowphp/app]
 - Very easy Translate Management
 - Many helpers
 - The native authentication system
+- Producer/Consumer with beanstalkd, database, Redis, SQS backend
 
 ## Contributing
 

src/Application/Application.php

@@ -82,10 +82,11 @@ public function __construct(Request $request, Response $response)
 
         $this->capsule = Capsule::getInstance();
 
-        $this->capsule->instance('request', $request);
         $this->capsule->instance('response', $response);
+        $this->capsule->instance('request', $request);
         $this->capsule->instance('app', $this);
 
+        $this->request->capture();
         parent::__construct($request->method(), $request->get('_method'));
     }
 
@@ -195,30 +196,17 @@ public function send(): ?bool
         // the routing collection
         $routes = $this->getRoutes();
 
-        if (!isset($routes[$method])) {
-            // We verify and call function associate by 404 code
-            $this->response->status(404);
-
-            if (empty($this->error_code)) {
-                $this->response->send(
-                    sprintf('Cannot %s %s 404', $method, $this->request->path())
-                );
-            }
-
-            return false;
-        }
-
         $response = null;
         $resolved = false;
 
-        foreach ($routes[$method] as $route) {
+        foreach ($routes[$method] ?? [] as $route) {
             // The route must be an instance of Route
             if (!($route instanceof Route)) {
                 continue;
             }
 
             // We launch the search of the method that arrived in the query
-             // then start checking the url of the request
+            // then start checking the url of the request
             if (!$route->match($this->request->path())) {
                 continue;
             }

src/Application/Exception/BaseErrorHandler.php

@@ -0,0 +1,83 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bow\Application\Exception;
+
+use PDOException;
+use Bow\View\View;
+use Bow\Http\Exception\HttpException;
+use Bow\Validation\Exception\ValidationException;
+use Policier\Exception\TokenExpiredException;
+use Policier\Exception\TokenInvalidException;
+
+class BaseErrorHandler
+{
+    /**
+     * Render view as response
+     *
+     * @param string $view
+     * @param array $data
+     * @return string
+     */
+    protected function render($view, $data = []): string
+    {
+        return View::parse($view, $data)->getContent();
+    }
+
+    /**
+     * Send the json as response
+     *
+     * @param string $data
+     * @param mixed $code
+     * @return mixed
+     */
+    protected function json($exception, $code = null)
+    {
+        if ($exception instanceof TokenInvalidException) {
+            $code = 'TOKEN_INVALID';
+        }
+
+        if ($exception instanceof TokenExpiredException) {
+            $code = 'TOKEN_EXPIRED';
+        }
+
+        if (is_null($code)) {
+            if (method_exists($exception, 'getStatus')) {
+                $code = $exception->getStatus();
+            } else {
+                $code = 'INTERNAL_SERVER_ERROR';
+            }
+        }
+
+        if (app_env("APP_ENV") == "production" && $exception instanceof PDOException) {
+            $message = 'An SQL error occurs. For security, we did not display the message.';
+        } else {
+            $message = $exception->getMessage();
+        }
+
+        $response = [
+            'message' => $message,
+            'code' => $code,
+            'time' => date('Y-m-d H:i:s')
+        ];
+
+        $status = 500;
+
+        if ($exception instanceof HttpException) {
+            $status = $exception->getStatusCode();
+            $response = array_merge($response, compact('status'));
+            if ($exception instanceof ValidationException) {
+                $response["errors"] = $exception->getErrors();
+            }
+        }
+
+        if (app_env("APP_ENV") != "production") {
+            $response["trace"] = $exception->getTrace();
+        }
+
+        response()->status($status);
+
+        return die(json_encode($response));
+    }
+}