Skip to content

Commit ab49211

Browse files
authored
Merge pull request #265 from WebFiori/dev
Dev
2 parents 8f90c06 + d406d00 commit ab49211

File tree

5 files changed

+82
-82
lines changed

5 files changed

+82
-82
lines changed

.github/workflows/php81.yaml

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
name: Build PHP 8.1
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
pull_request:
7+
branches: [ main ]
8+
jobs:
9+
test:
10+
11+
services:
12+
sql.data:
13+
image: mcr.microsoft.com/mssql/server:2019-latest
14+
env:
15+
SA_PASSWORD: ${{ secrets.SA_PASSWORD }}
16+
ACCEPT_EULA: Y
17+
MSSQL_PID: Express
18+
ports:
19+
- "1433:1433"
20+
21+
steps:
22+
23+
- name: Shutdown Ubuntu MySQL
24+
run: sudo service mysql stop
25+
26+
- name: Set up MySQL
27+
uses: mirromutth/[email protected]
28+
with:
29+
mysql version: '5.7'
30+
mysql database: 'testing_db'
31+
mysql root password: ${{ secrets.MYSQL_ROOT_PASSWORD }}
32+
mysql user: 'root'
33+
mysql password: ${{ secrets.MYSQL_ROOT_PASSWORD }}
34+
35+
- name: Wait for MySQL
36+
run: |
37+
while ! mysqladmin ping --host=127.0.0.1 --password=${{ secrets.MYSQL_ROOT_PASSWORD }} --silent; do
38+
sleep 1
39+
done
40+
41+
- name: Setup MSSQL
42+
run: |
43+
curl https://packages.microsoft.com/keys/microsoft.asc | sudo tee /etc/apt/trusted.gpg.d/microsoft.asc
44+
curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list
45+
sudo apt update
46+
sudo apt install mssql-tools18
47+
/opt/mssql-tools18/bin/sqlcmd -S localhost -U SA -P ${{ secrets.SA_PASSWORD }} -Q 'create database testing_db' -C
48+
49+
- name: Run Tests
50+
51+
uses: WebFiori/workflows/.github/workflows/test-php.yaml@main
52+
with:
53+
php-version: '8.1'
54+
55+
56+
code-coverage:
57+
name: Coverage
58+
needs: test
59+
uses: WebFiori/workflows/.github/workflows/coverage-codecov.yaml@main
60+
with:
61+
php-version: '8.1'
62+
coverage-file: 'php-8.1-coverage.xml'
63+
secrets:
64+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
65+
66+
67+

.github/workflows/php81.yml

Lines changed: 0 additions & 75 deletions
This file was deleted.

composer.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"ext-fileinfo": "*",
2424
"ext-openssl": "*",
2525
"webfiori/cache": "v1.1.0",
26-
"webfiori/http": "v3.6.0",
26+
"webfiori/http": "v3.6.1",
2727
"webfiori/file": "v1.3.8",
2828
"webfiori/jsonx": "v3.3.2",
2929
"webfiori/ui": "v2.6.4",
@@ -33,7 +33,13 @@
3333
"webfiori/mailer": "v1.3.1",
3434
"webfiori/err": "v1.2.0"
3535
},
36-
"require-dev": {},
36+
"scripts": {
37+
"test": "phpunit --configuration tests/phpunit.xml",
38+
"test-10": "phpunit --configuration tests/phpunit10.xml"
39+
},
40+
"require-dev": {
41+
"phpunit/phpunit": "^10.0"
42+
},
3743
"autoload": {
3844
"psr-4": {
3945
"webfiori\\framework\\": "webfiori/framework/"

tests/webfiori/framework/test/cli/AddCommandTest.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ public function testAddDBConnection00() {
4949
''
5050
]);
5151

52-
53-
$connName = 'db-connection-'.(count(App::getConfig()->getDBConnections()) - 1);
52+
$count = count(App::getConfig()->getDBConnections());
53+
$connName = 'db-connection-'.$count;
5454
$this->assertEquals([
5555
"What would you like to add?\n",
5656
"0: New database connection.\n",
@@ -139,7 +139,8 @@ public function testAddDBConnection02() {
139139
'add'
140140
]);
141141
$this->assertEquals(0, $runner->start());
142-
$connName = 'db-connection-'.count(App::getConfig()->getDBConnections());
142+
$count = count(App::getConfig()->getDBConnections());
143+
$connName = 'db-connection-'.($count);
143144
$this->assertEquals([
144145
"What would you like to add?\n",
145146
"0: New database connection.\n",
@@ -285,4 +286,5 @@ private function removeClass($classPath) {
285286
$file = new File(ROOT_PATH.$classPath.'.php');
286287
$file->remove();
287288
}
289+
288290
}

webfiori/framework/App.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ public static function initFrameworkVersionInfo() {
637637
*
638638
* @since 2.1
639639
*/
640-
define('WF_VERSION', '3.0.0-Beta.27');
640+
define('WF_VERSION', '3.0.0-Beta.28');
641641
/**
642642
* A constant that tells the type of framework version.
643643
*
@@ -653,7 +653,7 @@ public static function initFrameworkVersionInfo() {
653653
*
654654
* @since 2.1
655655
*/
656-
define('WF_RELEASE_DATE', '2025-05-26');
656+
define('WF_RELEASE_DATE', '2025-08-04');
657657
}
658658

659659
/**

0 commit comments

Comments
 (0)