From 09827af2d4d70b5e7d44d5c1234221528a70e3cf Mon Sep 17 00:00:00 2001 From: Ibrahim Date: Wed, 4 Dec 2024 12:25:59 +0300 Subject: [PATCH 01/19] chore: Updated Composer Dependencies --- composer.json | 2 +- composer.lock | 58 +++++++++++++++++++++++++-------------------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/composer.json b/composer.json index 20a9548..419bc54 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ "type":"project", "require": { "php": ">=7.0", - "webfiori/framework":"v3.0.0-Beta.14" + "webfiori/framework":"v3.0.0-Beta.17" }, "keywords": [ "framework", diff --git a/composer.lock b/composer.lock index bc60745..fd9294d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7d6713d2033cddbc85bf171d79a7a079", + "content-hash": "745e631b8a738774bec82ac84ff0d97d", "packages": [ { "name": "webfiori/cli", @@ -129,16 +129,16 @@ }, { "name": "webfiori/database", - "version": "v0.8.11", + "version": "0.8.12", "source": { "type": "git", "url": "https://github.com/WebFiori/database.git", - "reference": "fda0e183437061bc75fa3422836433a440baa8c0" + "reference": "23f1cc37fb5b2300ba949b334ac1c74fcd1b9d7c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WebFiori/database/zipball/fda0e183437061bc75fa3422836433a440baa8c0", - "reference": "fda0e183437061bc75fa3422836433a440baa8c0", + "url": "https://api.github.com/repos/WebFiori/database/zipball/23f1cc37fb5b2300ba949b334ac1c74fcd1b9d7c", + "reference": "23f1cc37fb5b2300ba949b334ac1c74fcd1b9d7c", "shasum": "" }, "require": { @@ -164,7 +164,7 @@ ], "support": { "issues": "https://github.com/WebFiori/database/issues", - "source": "https://github.com/WebFiori/database/tree/v0.8.11" + "source": "https://github.com/WebFiori/database/tree/v0.8.12" }, "funding": [ { @@ -180,7 +180,7 @@ "type": "ko_fi" } ], - "time": "2024-10-28T20:25:53+00:00" + "time": "2024-12-03T20:12:42+00:00" }, { "name": "webfiori/err", @@ -305,16 +305,16 @@ }, { "name": "webfiori/framework", - "version": "3.0.0-Beta.14", + "version": "3.0.0-Beta.17", "source": { "type": "git", "url": "https://github.com/WebFiori/framework.git", - "reference": "ffba40f52f419b6d1b93620757d5e85360d64938" + "reference": "0f6e4ae014d7e93b15081af0bbc1bc9e6150d666" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WebFiori/framework/zipball/ffba40f52f419b6d1b93620757d5e85360d64938", - "reference": "ffba40f52f419b6d1b93620757d5e85360d64938", + "url": "https://api.github.com/repos/WebFiori/framework/zipball/0f6e4ae014d7e93b15081af0bbc1bc9e6150d666", + "reference": "0f6e4ae014d7e93b15081af0bbc1bc9e6150d666", "shasum": "" }, "require": { @@ -325,12 +325,12 @@ "php": ">=7.0", "webfiori/cli": "v1.3.0", "webfiori/collections": "v1.1.4", - "webfiori/database": "v0.8.11", + "webfiori/database": "v0.8.12", "webfiori/err": "v1.1.0", "webfiori/file": "v1.3.6", - "webfiori/http": "v3.3.15", + "webfiori/http": "v3.4.1", "webfiori/jsonx": "v3.3.0", - "webfiori/mailer": "v1.2.0", + "webfiori/mailer": "v1.2.1", "webfiori/ui": "v2.6.3" }, "type": "library", @@ -379,20 +379,20 @@ "type": "ko_fi" } ], - "time": "2024-11-21T09:29:08+00:00" + "time": "2024-12-03T22:18:05+00:00" }, { "name": "webfiori/http", - "version": "v3.3.15", + "version": "3.4.1", "source": { "type": "git", "url": "https://github.com/WebFiori/http.git", - "reference": "842d9aed0bdf96dd45b44b03f9a04fa8ee7d895d" + "reference": "9fec0f73a51a619b33d7491a5cd749a06ca8ac1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WebFiori/http/zipball/842d9aed0bdf96dd45b44b03f9a04fa8ee7d895d", - "reference": "842d9aed0bdf96dd45b44b03f9a04fa8ee7d895d", + "url": "https://api.github.com/repos/WebFiori/http/zipball/9fec0f73a51a619b33d7491a5cd749a06ca8ac1d", + "reference": "9fec0f73a51a619b33d7491a5cd749a06ca8ac1d", "shasum": "" }, "require": { @@ -424,7 +424,7 @@ ], "support": { "issues": "https://github.com/WebFiori/http/issues", - "source": "https://github.com/WebFiori/http/tree/v3.3.15" + "source": "https://github.com/WebFiori/http/tree/v3.4.1" }, "funding": [ { @@ -432,7 +432,7 @@ "type": "custom" } ], - "time": "2024-11-20T20:47:16+00:00" + "time": "2024-12-01T03:41:37+00:00" }, { "name": "webfiori/jsonx", @@ -481,16 +481,16 @@ }, { "name": "webfiori/mailer", - "version": "v1.2.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/WebFiori/mail.git", - "reference": "e5b61fb9d8bc27c4c2ac8106a98ec7d1335cd65e" + "reference": "c95a67220d71529e29f707d604917ffbcbb24d9d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WebFiori/mail/zipball/e5b61fb9d8bc27c4c2ac8106a98ec7d1335cd65e", - "reference": "e5b61fb9d8bc27c4c2ac8106a98ec7d1335cd65e", + "url": "https://api.github.com/repos/WebFiori/mail/zipball/c95a67220d71529e29f707d604917ffbcbb24d9d", + "reference": "c95a67220d71529e29f707d604917ffbcbb24d9d", "shasum": "" }, "require": { @@ -524,7 +524,7 @@ ], "support": { "issues": "https://github.com/WebFiori/mail/issues", - "source": "https://github.com/WebFiori/mail/tree/v1.2.0" + "source": "https://github.com/WebFiori/mail/tree/v1.2.1" }, "funding": [ { @@ -540,7 +540,7 @@ "type": "ko_fi" } ], - "time": "2024-04-14T16:06:30+00:00" + "time": "2024-12-03T13:31:05+00:00" }, { "name": "webfiori/ui", @@ -605,6 +605,6 @@ "platform": { "php": ">=7.0" }, - "platform-dev": [], - "plugin-api-version": "2.3.0" + "platform-dev": {}, + "plugin-api-version": "2.6.0" } From 546eec25bff1736a0b3434243b80ed55df05e532 Mon Sep 17 00:00:00 2001 From: Ibrahim Date: Wed, 4 Dec 2024 16:37:29 +0300 Subject: [PATCH 02/19] chore: Updated Dependencies --- composer.json | 13 ++----------- composer.lock | 12 ++++++------ 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/composer.json b/composer.json index 419bc54..8d3d8ce 100644 --- a/composer.json +++ b/composer.json @@ -7,15 +7,6 @@ "type":"project", "require": { "php": ">=7.0", - "webfiori/framework":"v3.0.0-Beta.17" - }, - "keywords": [ - "framework", - "webfiori", - "php", - "API", - "Web APIs", - "Themes" - ], - "license": "MIT" + "webfiori/framework":"v3.0.0-Beta.18" + } } diff --git a/composer.lock b/composer.lock index fd9294d..a41955a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "745e631b8a738774bec82ac84ff0d97d", + "content-hash": "29c24698bdf5f5bda9e996bcbda70ace", "packages": [ { "name": "webfiori/cli", @@ -305,16 +305,16 @@ }, { "name": "webfiori/framework", - "version": "3.0.0-Beta.17", + "version": "3.0.0-Beta.18", "source": { "type": "git", "url": "https://github.com/WebFiori/framework.git", - "reference": "0f6e4ae014d7e93b15081af0bbc1bc9e6150d666" + "reference": "8ba7eb498664041c7bf5fdcdcc2b432421afcbf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WebFiori/framework/zipball/0f6e4ae014d7e93b15081af0bbc1bc9e6150d666", - "reference": "0f6e4ae014d7e93b15081af0bbc1bc9e6150d666", + "url": "https://api.github.com/repos/WebFiori/framework/zipball/8ba7eb498664041c7bf5fdcdcc2b432421afcbf8", + "reference": "8ba7eb498664041c7bf5fdcdcc2b432421afcbf8", "shasum": "" }, "require": { @@ -379,7 +379,7 @@ "type": "ko_fi" } ], - "time": "2024-12-03T22:18:05+00:00" + "time": "2024-12-04T12:03:19+00:00" }, { "name": "webfiori/http", From ed7c3b0d842f688e648f97798fc81cb82c530598 Mon Sep 17 00:00:00 2001 From: Ibrahim Date: Wed, 4 Dec 2024 16:38:25 +0300 Subject: [PATCH 03/19] refactor: Simplify the Code on Index --- public/index.php | 88 +++--------------------------------------------- 1 file changed, 5 insertions(+), 83 deletions(-) diff --git a/public/index.php b/public/index.php index f081333..7ad7624 100644 --- a/public/index.php +++ b/public/index.php @@ -2,87 +2,9 @@ namespace webfiori; -use Exception; -use webfiori\framework\router\Router; -use webfiori\framework\session\SessionsManager; -use webfiori\framework\App; -use webfiori\http\Request; -use webfiori\http\Response; -/** - * The name of the directory at which the developer will have his own application - * code. - * - * @since 2.3.0 - */ -define('APP_DIR', 'app'); - - -/** - * The entry point of all requests. - * - * @author Ibrahim - */ -class Index { - private static $instance; - private function __construct() { - $DS = DIRECTORY_SEPARATOR; - /** - * The root directory that is used to load all other required system files. - */ - if (!defined('ROOT_PATH')) { - $publicFolder = $DS.'public'; +require '../vendor/autoload.php'; - if (substr(__DIR__, strlen(__DIR__) - strlen($publicFolder)) == $publicFolder) { - //HTTP run - define('ROOT_PATH', substr(__DIR__,0, strlen(__DIR__) - strlen($DS.'public'))); - } else { - //CLI run - define('ROOT_PATH', __DIR__); - } - } - $this->loadAppClass(); - App::setConfigDriver('\\webfiori\\framework\\config\\JsonDriver'); - /** - * This where magic will start. - * - * Planting application seed into the ground and make your work bloom. - */ - App::start(); - - if (App::getRunner()->isCLI() === true) { - App::getRunner()->start(); - } else { - //route user request. - SessionsManager::start('wf-session'); - Router::route(Request::getRequestedURI()); - Response::send(); - } - } - /** - * Try to load the class 'App'. - * - * @throws Exception - */ - private function loadAppClass() { - $DS = DIRECTORY_SEPARATOR; - $frameworkPath = ROOT_PATH.$DS.'vendor'.$DS.'webfiori'.$DS.'framework'; - $corePath = $frameworkPath.$DS.'webfiori'.$DS.'framework'; - $rootClass = $DS.'App.php'; - - if (file_exists($corePath.$rootClass)) { - define('WF_CORE_PATH', $corePath); - require_once $corePath.$rootClass; - } else { - throw new Exception('Unable to locate the class "App".'); - } - } - /** - * Creates a single instance of the class. - */ - public static function create() { - if (self::$instance === null) { - self::$instance = new Index(); - } - } -} -Index::create(); \ No newline at end of file +use webfiori\framework\App; +App::initiate('app', 'public', __DIR__); +App::start(); +App::handle(); From 930cf546bea9c0fd9eef4e0f2b879a88349cd8f3 Mon Sep 17 00:00:00 2001 From: Ibrahim Date: Wed, 4 Dec 2024 17:02:43 +0300 Subject: [PATCH 04/19] ci: Added Release Please --- .github/workflows/php.yml | 34 +++++++++++++++++-- release-please-config.json | 68 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 3 deletions(-) create mode 100644 release-please-config.json diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index f256b3c..9b6c6e2 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -7,8 +7,8 @@ on: branches: [ main ] jobs: - build: - + test: + name: Run Tests runs-on: ubuntu-latest strategy: @@ -16,7 +16,7 @@ jobs: steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@2.30.0 @@ -30,3 +30,31 @@ jobs: - name: Execute Tests run: phpunit --configuration tests/phpunit.xml + + release_staging: + name: Prepare Beta Release Branch + needs: + - "test" + runs-on: ubuntu-latest + if: github.ref == 'refs/heads/dev' + steps: + - uses: actions/checkout@v4 + - uses: google-github-actions/release-please-action@v3 + with: + release-type: php + default-branch: dev + config-file: release-please-config.json + token: ${{ secrets.GITHUB_TOKEN }} + release_prod: + name: Prepare Production Release Branch + needs: + - "test" + runs-on: ubuntu-latest + if: github.ref == 'refs/heads/main' + steps: + - uses: actions/checkout@v4 + - uses: google-github-actions/release-please-action@v3 + with: + release-type: php + config-file: release-please-config.json + token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/release-please-config.json b/release-please-config.json new file mode 100644 index 0000000..e8e86df --- /dev/null +++ b/release-please-config.json @@ -0,0 +1,68 @@ +{ + "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json", + "include-v-in-tag": true, + "tag-separator": "-", + "changelog-path": "CHANGELOG.md", + "changelog-sections": [ + { + "type": "feat", + "section": "Features" + }, + { + "type": "feature", + "section": "Features" + }, + { + "type": "fix", + "section": "Bug Fixes" + }, + { + "type": "perf", + "section": "Performance Improvements" + }, + { + "type": "revert", + "section": "Reverts" + }, + { + "type": "docs", + "section": "Documentation" + }, + { + "type": "style", + "section": "Styles" + }, + { + "type": "chore", + "section": "Miscellaneous Chores" + }, + { + "type": "refactor", + "section": "Code Refactoring" + }, + { + "type": "test", + "section": "Testing" + }, + { + "type": "build", + "section": "Build System" + }, + { + "type": "ci", + "section": "Continuous Integration" + }, + { + "type": "ui", + "section": "User Interface" + }, + { + "type": "database", + "section": "Database Changes" + }, + { + "type": "email", + "section": "Email Notifications Changes" + } + ] +} \ No newline at end of file From c82b98939167749b143c8bc86a325609ae6c4b5e Mon Sep 17 00:00:00 2001 From: Ibrahim Date: Wed, 4 Dec 2024 17:10:27 +0300 Subject: [PATCH 05/19] chore: release v3.0.0-Beta.18 Release-As: v3.0.0-Beta.18 From d287aab051237c7e8908855a7bb9373930b761b2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Dec 2024 14:11:50 +0000 Subject: [PATCH 06/19] chore(dev): release 3.0.0-Beta.18 --- CHANGELOG.md | 18 ++++++++++++++++++ composer.json | 8 +++----- 2 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..1117ca4 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,18 @@ +# Changelog + +## [3.0.0-Beta.18](https://github.com/WebFiori/app/compare/v3.0.0-RC7...v3.0.0-Beta.18) (2024-12-04) + + +### Miscellaneous Chores + +* release v3.0.0-Beta.18 ([c82b989](https://github.com/WebFiori/app/commit/c82b98939167749b143c8bc86a325609ae6c4b5e)) +* Updated Composer Dependencies ([09827af](https://github.com/WebFiori/app/commit/09827af2d4d70b5e7d44d5c1234221528a70e3cf)) +* Updated Core Framework Version ([b6e00a3](https://github.com/WebFiori/app/commit/b6e00a3b8883d5736c2ccd96b8c0b8c5e0c025b1)) +* Updated Core Framework Version ([48623e3](https://github.com/WebFiori/app/commit/48623e383356957b2008fd09c90be94afdb7da29)) +* Updated Core Framework Version ([20ed7ea](https://github.com/WebFiori/app/commit/20ed7ea9939e2cf9339b10964ad5e0cc4b028749)) +* Updated Dependencies ([546eec2](https://github.com/WebFiori/app/commit/546eec25bff1736a0b3434243b80ed55df05e532)) +* Updated Framework Version ([bf81d5d](https://github.com/WebFiori/app/commit/bf81d5d746103d3491fd2e4ac54179dd587dbbce)) +* Updated Framework Version ([2df0e28](https://github.com/WebFiori/app/commit/2df0e2846121f7ed57350da2dc10488592362a89)) +* Updated Framework Version ([333ee5c](https://github.com/WebFiori/app/commit/333ee5c3f8d73388dc9d5889006568ce2413d20f)) +* Updated Framework Version ([17fb434](https://github.com/WebFiori/app/commit/17fb434209b611e7cfab5a6e6cd288fae924ab23)) +* Updated Framework Version ([57f362c](https://github.com/WebFiori/app/commit/57f362c61e572c5b3a1fe4d66c2f7bf9b89c7806)) diff --git a/composer.json b/composer.json index 8d3d8ce..8a9277e 100644 --- a/composer.json +++ b/composer.json @@ -1,12 +1,10 @@ { "name": "webfiori/app", "description": "WebFiori framework. Made to make the web bloom. This is the basic WebFiori application template. Use it to create your amazing art.", - "authors": [ - - ], - "type":"project", + "authors": [], + "type": "project", "require": { "php": ">=7.0", - "webfiori/framework":"v3.0.0-Beta.18" + "webfiori/framework": "v3.0.0-Beta.18" } } From 74160762dafa7509d7bfd531062be1886979f7b2 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Wed, 9 Apr 2025 00:12:11 +0300 Subject: [PATCH 07/19] chore: Updated Framework Version --- composer.json | 2 +- composer.lock | 242 ++++++++++++++++++++++++++++---------------------- 2 files changed, 136 insertions(+), 108 deletions(-) diff --git a/composer.json b/composer.json index 8a9277e..d422495 100644 --- a/composer.json +++ b/composer.json @@ -5,6 +5,6 @@ "type": "project", "require": { "php": ">=7.0", - "webfiori/framework": "v3.0.0-Beta.18" + "webfiori/framework": "v3.0.0-Beta.26" } } diff --git a/composer.lock b/composer.lock index a41955a..0c29faf 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,70 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "29c24698bdf5f5bda9e996bcbda70ace", + "content-hash": "0341e22c2cabc0b8ee8820af85fcd2fa", "packages": [ + { + "name": "webfiori/cache", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/WebFiori/cache.git", + "reference": "04243157f69de111536f0a1dc0b050b6510bb8e7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/WebFiori/cache/zipball/04243157f69de111536f0a1dc0b050b6510bb8e7", + "reference": "04243157f69de111536f0a1dc0b050b6510bb8e7", + "shasum": "" + }, + "type": "library", + "autoload": { + "psr-4": { + "webfiori\\cache\\": "webfiori/cache/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "A simple caching engine which is highly customizable.", + "keywords": [ + "cache", + "customizable", + "file cache" + ], + "support": { + "issues": "https://github.com/WebFiori/cache/issues", + "source": "https://github.com/WebFiori/cache/tree/v1.1.0" + }, + "funding": [ + { + "url": "https://paypal.me/IbrahimBinAlshikh", + "type": "custom" + }, + { + "url": "https://www.buymeacoffee.com/ibrahimdev", + "type": "custom" + }, + { + "url": "https://ko-fi.com/ibrahimdev", + "type": "ko_fi" + } + ], + "time": "2025-01-06T16:32:38+00:00" + }, { "name": "webfiori/cli", - "version": "v1.3.0", + "version": "v1.3.1", "source": { "type": "git", "url": "https://github.com/WebFiori/cli.git", - "reference": "d9fc5819dd7024a4aef4cb28775ea892014c08ab" + "reference": "abc3d6b083d83ddf91355c3b6825217cd6123cbe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WebFiori/cli/zipball/d9fc5819dd7024a4aef4cb28775ea892014c08ab", - "reference": "d9fc5819dd7024a4aef4cb28775ea892014c08ab", + "url": "https://api.github.com/repos/WebFiori/cli/zipball/abc3d6b083d83ddf91355c3b6825217cd6123cbe", + "reference": "abc3d6b083d83ddf91355c3b6825217cd6123cbe", "shasum": "" }, "require": { @@ -51,36 +101,22 @@ ], "support": { "issues": "https://github.com/WebFiori/cli/issues", - "source": "https://github.com/WebFiori/cli/tree/v1.3.0" + "source": "https://github.com/WebFiori/cli/tree/v1.3.1" }, - "funding": [ - { - "url": "https://paypal.me/IbrahimBinAlshikh", - "type": "custom" - }, - { - "url": "https://www.buymeacoffee.com/ibrahimdev", - "type": "custom" - }, - { - "url": "https://ko-fi.com/ibrahimdev", - "type": "ko_fi" - } - ], - "time": "2024-08-20T21:10:05+00:00" + "time": "2025-04-07T19:18:39+00:00" }, { "name": "webfiori/collections", - "version": "v1.1.4", + "version": "1.1.5", "source": { "type": "git", "url": "https://github.com/WebFiori/collections.git", - "reference": "e82f0418c298de0c534cf6b1f84b703207c40b5b" + "reference": "18491285e5c698d72590e5081b3f445a47428a93" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WebFiori/collections/zipball/e82f0418c298de0c534cf6b1f84b703207c40b5b", - "reference": "e82f0418c298de0c534cf6b1f84b703207c40b5b", + "url": "https://api.github.com/repos/WebFiori/collections/zipball/18491285e5c698d72590e5081b3f445a47428a93", + "reference": "18491285e5c698d72590e5081b3f445a47428a93", "shasum": "" }, "require": { @@ -92,7 +128,7 @@ "type": "library", "autoload": { "psr-4": { - "webfiori\\collections\\": "webfiori\\collections" + "webfiori\\collections\\": "webfiori/collections/" } }, "notification-url": "https://packagist.org/downloads/", @@ -109,7 +145,7 @@ ], "support": { "issues": "https://github.com/WebFiori/collections/issues", - "source": "https://github.com/WebFiori/collections/tree/v1.1.4" + "source": "https://github.com/WebFiori/collections/tree/v1.1.5" }, "funding": [ { @@ -125,20 +161,20 @@ "type": "ko_fi" } ], - "time": "2023-12-08T22:02:45+00:00" + "time": "2024-12-23T21:59:36+00:00" }, { "name": "webfiori/database", - "version": "0.8.12", + "version": "0.10.0", "source": { "type": "git", "url": "https://github.com/WebFiori/database.git", - "reference": "23f1cc37fb5b2300ba949b334ac1c74fcd1b9d7c" + "reference": "6ea57d68da4279d82324b4e90fa7d1a335c3d35b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WebFiori/database/zipball/23f1cc37fb5b2300ba949b334ac1c74fcd1b9d7c", - "reference": "23f1cc37fb5b2300ba949b334ac1c74fcd1b9d7c", + "url": "https://api.github.com/repos/WebFiori/database/zipball/6ea57d68da4279d82324b4e90fa7d1a335c3d35b", + "reference": "6ea57d68da4279d82324b4e90fa7d1a335c3d35b", "shasum": "" }, "require": { @@ -164,7 +200,7 @@ ], "support": { "issues": "https://github.com/WebFiori/database/issues", - "source": "https://github.com/WebFiori/database/tree/v0.8.12" + "source": "https://github.com/WebFiori/database/tree/v0.10.0" }, "funding": [ { @@ -180,20 +216,20 @@ "type": "ko_fi" } ], - "time": "2024-12-03T20:12:42+00:00" + "time": "2025-02-04T12:04:02+00:00" }, { "name": "webfiori/err", - "version": "v1.1.0", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/WebFiori/err.git", - "reference": "dbd6624667e0be7424a48da821ec89a02122ed60" + "reference": "d32499334404f80b1647dcaf35fe572251535835" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WebFiori/err/zipball/dbd6624667e0be7424a48da821ec89a02122ed60", - "reference": "dbd6624667e0be7424a48da821ec89a02122ed60", + "url": "https://api.github.com/repos/WebFiori/err/zipball/d32499334404f80b1647dcaf35fe572251535835", + "reference": "d32499334404f80b1647dcaf35fe572251535835", "shasum": "" }, "require": { @@ -220,36 +256,22 @@ ], "support": { "issues": "https://github.com/WebFiori/err/issues", - "source": "https://github.com/WebFiori/err/tree/v1.1.0" + "source": "https://github.com/WebFiori/err/tree/v1.2.0" }, - "funding": [ - { - "url": "https://paypal.me/IbrahimBinAlshikh", - "type": "custom" - }, - { - "url": "https://www.buymeacoffee.com/ibrahimdev", - "type": "custom" - }, - { - "url": "https://ko-fi.com/ibrahimdev", - "type": "ko_fi" - } - ], - "time": "2024-06-26T21:03:32+00:00" + "time": "2025-04-07T14:33:57+00:00" }, { "name": "webfiori/file", - "version": "v1.3.6", + "version": "1.3.8", "source": { "type": "git", "url": "https://github.com/WebFiori/file.git", - "reference": "badb7251fb8362abfebc51f90d4c97d12e502f15" + "reference": "d3495a7cb40d047cb92b6bb7a814e064fdd35250" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WebFiori/file/zipball/badb7251fb8362abfebc51f90d4c97d12e502f15", - "reference": "badb7251fb8362abfebc51f90d4c97d12e502f15", + "url": "https://api.github.com/repos/WebFiori/file/zipball/d3495a7cb40d047cb92b6bb7a814e064fdd35250", + "reference": "d3495a7cb40d047cb92b6bb7a814e064fdd35250", "shasum": "" }, "require": { @@ -262,7 +284,7 @@ "type": "library", "autoload": { "psr-4": { - "webfiori\\file\\": "webfiori\\file" + "webfiori\\file\\": "webfiori/file/" } }, "notification-url": "https://packagist.org/downloads/", @@ -285,7 +307,7 @@ ], "support": { "issues": "https://github.com/WebFiori/file/issues", - "source": "https://github.com/WebFiori/file/tree/v1.3.6" + "source": "https://github.com/WebFiori/file/tree/v1.3.8" }, "funding": [ { @@ -301,20 +323,20 @@ "type": "ko_fi" } ], - "time": "2024-04-29T20:08:30+00:00" + "time": "2025-01-06T22:21:51+00:00" }, { "name": "webfiori/framework", - "version": "3.0.0-Beta.18", + "version": "3.0.0-Beta.26", "source": { "type": "git", "url": "https://github.com/WebFiori/framework.git", - "reference": "8ba7eb498664041c7bf5fdcdcc2b432421afcbf8" + "reference": "260e4b4c4cb763e9356a536dd539306de51cac82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WebFiori/framework/zipball/8ba7eb498664041c7bf5fdcdcc2b432421afcbf8", - "reference": "8ba7eb498664041c7bf5fdcdcc2b432421afcbf8", + "url": "https://api.github.com/repos/WebFiori/framework/zipball/260e4b4c4cb763e9356a536dd539306de51cac82", + "reference": "260e4b4c4cb763e9356a536dd539306de51cac82", "shasum": "" }, "require": { @@ -323,15 +345,16 @@ "ext-mbstring": "*", "ext-openssl": "*", "php": ">=7.0", - "webfiori/cli": "v1.3.0", - "webfiori/collections": "v1.1.4", - "webfiori/database": "v0.8.12", - "webfiori/err": "v1.1.0", - "webfiori/file": "v1.3.6", - "webfiori/http": "v3.4.1", - "webfiori/jsonx": "v3.3.0", - "webfiori/mailer": "v1.2.1", - "webfiori/ui": "v2.6.3" + "webfiori/cache": "v1.1.0", + "webfiori/cli": "v1.3.1", + "webfiori/collections": "v1.1.5", + "webfiori/database": "v0.10.0", + "webfiori/err": "v1.2.0", + "webfiori/file": "v1.3.8", + "webfiori/http": "v3.6.0", + "webfiori/jsonx": "v3.3.2", + "webfiori/mailer": "v1.3.1", + "webfiori/ui": "v2.6.4" }, "type": "library", "autoload": { @@ -379,20 +402,20 @@ "type": "ko_fi" } ], - "time": "2024-12-04T12:03:19+00:00" + "time": "2025-04-08T21:00:10+00:00" }, { "name": "webfiori/http", - "version": "3.4.1", + "version": "3.6.0", "source": { "type": "git", "url": "https://github.com/WebFiori/http.git", - "reference": "9fec0f73a51a619b33d7491a5cd749a06ca8ac1d" + "reference": "f86c0a5dab2e5979c505e687138ba282eecd8bca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WebFiori/http/zipball/9fec0f73a51a619b33d7491a5cd749a06ca8ac1d", - "reference": "9fec0f73a51a619b33d7491a5cd749a06ca8ac1d", + "url": "https://api.github.com/repos/WebFiori/http/zipball/f86c0a5dab2e5979c505e687138ba282eecd8bca", + "reference": "f86c0a5dab2e5979c505e687138ba282eecd8bca", "shasum": "" }, "require": { @@ -424,7 +447,7 @@ ], "support": { "issues": "https://github.com/WebFiori/http/issues", - "source": "https://github.com/WebFiori/http/tree/v3.4.1" + "source": "https://github.com/WebFiori/http/tree/v3.6.0" }, "funding": [ { @@ -432,20 +455,20 @@ "type": "custom" } ], - "time": "2024-12-01T03:41:37+00:00" + "time": "2024-12-24T20:07:08+00:00" }, { "name": "webfiori/jsonx", - "version": "v3.3.0", + "version": "3.3.2", "source": { "type": "git", "url": "https://github.com/WebFiori/json.git", - "reference": "833fd51516cce33e9bcc2efd0e81956b541ae7dc" + "reference": "4c5fe729fff65a246bc0715e48ef2cd1465e46c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WebFiori/json/zipball/833fd51516cce33e9bcc2efd0e81956b541ae7dc", - "reference": "833fd51516cce33e9bcc2efd0e81956b541ae7dc", + "url": "https://api.github.com/repos/WebFiori/json/zipball/4c5fe729fff65a246bc0715e48ef2cd1465e46c2", + "reference": "4c5fe729fff65a246bc0715e48ef2cd1465e46c2", "shasum": "" }, "require": { @@ -469,7 +492,7 @@ ], "support": { "issues": "https://github.com/WebFiori/json/issues", - "source": "https://github.com/WebFiori/json/tree/v3.3.0" + "source": "https://github.com/WebFiori/json/tree/v3.3.2" }, "funding": [ { @@ -477,20 +500,20 @@ "type": "custom" } ], - "time": "2023-08-03T07:59:28+00:00" + "time": "2025-01-28T19:58:59+00:00" }, { "name": "webfiori/mailer", - "version": "1.2.1", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/WebFiori/mail.git", - "reference": "c95a67220d71529e29f707d604917ffbcbb24d9d" + "reference": "8bc23bc22c23a8a39b77539f7ec3648937e87bb9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WebFiori/mail/zipball/c95a67220d71529e29f707d604917ffbcbb24d9d", - "reference": "c95a67220d71529e29f707d604917ffbcbb24d9d", + "url": "https://api.github.com/repos/WebFiori/mail/zipball/8bc23bc22c23a8a39b77539f7ec3648937e87bb9", + "reference": "8bc23bc22c23a8a39b77539f7ec3648937e87bb9", "shasum": "" }, "require": { @@ -501,7 +524,7 @@ "type": "library", "autoload": { "psr-4": { - "webfiori\\email\\": "webfiori\\email" + "webfiori\\email\\": "webfiori/email/" } }, "notification-url": "https://packagist.org/downloads/", @@ -524,7 +547,7 @@ ], "support": { "issues": "https://github.com/WebFiori/mail/issues", - "source": "https://github.com/WebFiori/mail/tree/v1.2.1" + "source": "https://github.com/WebFiori/mail/tree/v1.3.1" }, "funding": [ { @@ -540,33 +563,30 @@ "type": "ko_fi" } ], - "time": "2024-12-03T13:31:05+00:00" + "time": "2024-12-24T19:31:13+00:00" }, { "name": "webfiori/ui", - "version": "v2.6.3", + "version": "2.6.4", "source": { "type": "git", "url": "https://github.com/WebFiori/ui.git", - "reference": "c6d0b13ff0d69473cdef5560edadb67032128150" + "reference": "92684505c2562e78d8881e7720a62d4c4caffd4f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WebFiori/ui/zipball/c6d0b13ff0d69473cdef5560edadb67032128150", - "reference": "c6d0b13ff0d69473cdef5560edadb67032128150", + "url": "https://api.github.com/repos/WebFiori/ui/zipball/92684505c2562e78d8881e7720a62d4c4caffd4f", + "reference": "92684505c2562e78d8881e7720a62d4c4caffd4f", "shasum": "" }, "require": { "php": ">=7.0", - "webfiori/collections": "1.1.x" - }, - "require-dev": { - "phpunit/phpunit": "^5" + "webfiori/collections": "1.x.x" }, "type": "library", "autoload": { "psr-4": { - "webfiori\\ui\\": "webfiori\\ui" + "webfiori\\ui\\": "webfiori/ui/" } }, "notification-url": "https://packagist.org/downloads/", @@ -583,15 +603,23 @@ ], "support": { "issues": "https://github.com/WebFiori/ui/issues", - "source": "https://github.com/WebFiori/ui/tree/v2.6.3" + "source": "https://github.com/WebFiori/ui/tree/v2.6.4" }, "funding": [ { "url": "https://paypal.me/IbrahimBinAlshikh", "type": "custom" + }, + { + "url": "https://www.buymeacoffee.com/ibrahimdev", + "type": "custom" + }, + { + "url": "https://ko-fi.com/ibrahimdev", + "type": "ko_fi" } ], - "time": "2024-07-08T22:04:06+00:00" + "time": "2024-12-24T10:26:50+00:00" } ], "packages-dev": [], @@ -605,6 +633,6 @@ "platform": { "php": ">=7.0" }, - "platform-dev": {}, - "plugin-api-version": "2.6.0" + "platform-dev": [], + "plugin-api-version": "2.1.0" } From c64cd1a2bd957593c1c70a9d3ca11837644a7a0f Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Wed, 9 Apr 2025 00:52:16 +0300 Subject: [PATCH 08/19] Update bootstrap.php --- tests/bootstrap.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 8261371..6427728 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -93,6 +93,7 @@ App::setConfigDriver($driver); $configFileName = 'app-config-testing.json'; fprintf(STDOUT,"Setting application configuration file to '$configFileName'\n"); +App::initiate(APP_DIR); App::getConfig()->setConfigFileName($configFileName); App::getConfig()->initialize(); App::start(); From 0092277b7fe8cd94c8fee6bad8818e4b0723176f Mon Sep 17 00:00:00 2001 From: Ibrahim Date: Wed, 9 Apr 2025 10:44:32 +0300 Subject: [PATCH 09/19] Update php.yml --- .github/workflows/php.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 9b6c6e2..a3a3f1a 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v4 - name: Setup PHP - uses: shivammathur/setup-php@2.30.0 + uses: shivammathur/setup-php@2 with: php-version: 8.3 extensions: mbstring, sqlsrv, iconv From 2a95eef1d57e2fe796982a913e6bd7d4bc848cc6 Mon Sep 17 00:00:00 2001 From: Ibrahim Date: Wed, 9 Apr 2025 10:45:31 +0300 Subject: [PATCH 10/19] Update php.yml --- .github/workflows/php.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index a3a3f1a..4fdf24c 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v4 - name: Setup PHP - uses: shivammathur/setup-php@2 + uses: shivammathur/setup-php@v2 with: php-version: 8.3 extensions: mbstring, sqlsrv, iconv From 4a08ff597ec1dc1f14a66aa4143342d2a1484aa4 Mon Sep 17 00:00:00 2001 From: Ibrahim Date: Wed, 9 Apr 2025 10:49:34 +0300 Subject: [PATCH 11/19] Update php.yml --- .github/workflows/php.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 4fdf24c..761287e 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -23,7 +23,7 @@ jobs: with: php-version: 8.3 extensions: mbstring, sqlsrv, iconv - tools: phpunit, composer + tools: phpunit:9.5.20, composer - name: Install dependencies run: composer install --prefer-dist --no-progress From 8c969b0ceec9306d00451c4331614ad82dc4dc64 Mon Sep 17 00:00:00 2001 From: Ibrahim Date: Wed, 9 Apr 2025 11:06:08 +0300 Subject: [PATCH 12/19] Update index.php --- public/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/index.php b/public/index.php index 7ad7624..d2ed469 100644 --- a/public/index.php +++ b/public/index.php @@ -2,7 +2,7 @@ namespace webfiori; -require '../vendor/autoload.php'; +require __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'vendor'.DIRECTORY_SEPARATOR.'autoload.php'; use webfiori\framework\App; App::initiate('app', 'public', __DIR__); From 49010d0d72774ac9b83cc3532224eb7050ae9887 Mon Sep 17 00:00:00 2001 From: Ibrahim Date: Wed, 9 Apr 2025 11:06:36 +0300 Subject: [PATCH 13/19] Update .gitattributes --- .gitattributes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 3ef96b3..1e07184 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5,4 +5,5 @@ /.gitignore export-ignore /.travis.yml export-ignore /phpunit.xml export-ignore -/sonar-project.properties export-ignore \ No newline at end of file +/sonar-project.properties export-ignore +/release-commit.php export-ignore \ No newline at end of file From 8663e0b642b6ed568063b0a63bdd23a891bc6e51 Mon Sep 17 00:00:00 2001 From: Ibrahim Date: Wed, 9 Apr 2025 11:11:00 +0300 Subject: [PATCH 14/19] Create release-commit.php --- release-commit.php | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 release-commit.php diff --git a/release-commit.php b/release-commit.php new file mode 100644 index 0000000..3cb8f8f --- /dev/null +++ b/release-commit.php @@ -0,0 +1,9 @@ + Date: Wed, 9 Apr 2025 11:11:24 +0300 Subject: [PATCH 15/19] chore: release v3.0.0-Beta.26 Release-As: v3.0.0-Beta.26 From f48d970edee31b9f9d53f16e79d8d09fe4267b6d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 08:12:14 +0000 Subject: [PATCH 16/19] chore(dev): release 3.0.0-Beta.26 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1117ca4..c7af98e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [3.0.0-Beta.26](https://github.com/WebFiori/app/compare/v3.0.0-Beta.18...v3.0.0-Beta.26) (2025-04-09) + + +### Miscellaneous Chores + +* release v3.0.0-Beta.26 ([e21bbf5](https://github.com/WebFiori/app/commit/e21bbf5aedcbccaf83faff0e336561adaa72049c)) +* Updated Framework Version ([7416076](https://github.com/WebFiori/app/commit/74160762dafa7509d7bfd531062be1886979f7b2)) + ## [3.0.0-Beta.18](https://github.com/WebFiori/app/compare/v3.0.0-RC7...v3.0.0-Beta.18) (2024-12-04) From 10d6166dfdf7e50d7f3231f02d50453e5ed602eb Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Thu, 23 Oct 2025 15:25:10 +0300 Subject: [PATCH 17/19] Update WebFioriV108.php --- themes/webfiori108/WebFioriV108.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/themes/webfiori108/WebFioriV108.php b/themes/webfiori108/WebFioriV108.php index ad759b2..9510213 100644 --- a/themes/webfiori108/WebFioriV108.php +++ b/themes/webfiori108/WebFioriV108.php @@ -1,15 +1,15 @@ setClassName('col-2'); return $aside; } - public function getFooterNode() { + public function getFooterNode(): HTMLNode { $footer = new HTMLNode('footer'); $footer->setClassName('bd-footer text-muted'); $footer->setClassName('container-fluid p-md-4'); @@ -280,7 +280,7 @@ public function getFooterNode() { return $footer; } - public function getHeadNode() { + public function getHeadNode(): HeadNode { $head = new HeadNode(); $head->addCSS('https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css'); $head->addJs('https://code.jquery.com/jquery-3.4.1.slim.min.js'); @@ -290,7 +290,7 @@ public function getHeadNode() { return $head; } - public function getHeaderNode() { + public function getHeaderNode(): HTMLNode { $header = new HTMLNode('header'); $header->setClassName('container-fluid'); $mainNav = new HTMLNode('nav'); From bdadb771402bd56d66981109e2445277fcc3bb2a Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Thu, 23 Oct 2025 15:25:30 +0300 Subject: [PATCH 18/19] Update index.php --- public/index.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/public/index.php b/public/index.php index d2ed469..a671e5c 100644 --- a/public/index.php +++ b/public/index.php @@ -1,10 +1,13 @@ Date: Thu, 23 Oct 2025 15:26:09 +0300 Subject: [PATCH 19/19] Update composer.json --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index d422495..5b11792 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "authors": [], "type": "project", "require": { - "php": ">=7.0", - "webfiori/framework": "v3.0.0-Beta.26" + "php": ">=8.1", + "webfiori/framework": "3.0.0-beta.30" } }