Skip to content

Commit b40ee21

Browse files
usernaneusernane
committed
Merge branch 'dev' of https://github.com/WebFiori/framework into dev
2 parents 55265bf + 260e4b4 commit b40ee21

File tree

15 files changed

+223
-52
lines changed

15 files changed

+223
-52
lines changed

‎.github/workflows/php80.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
sql.data:
1414
image: mcr.microsoft.com/mssql/server:2019-latest
1515
env:
16-
SA_PASSWORD: ${{secrets.SA_PASSWORD}}
16+
SA_PASSWORD: ${{ secrets.SA_PASSWORD }}
1717
ACCEPT_EULA: Y
1818
MSSQL_PID: Express
1919
ports:
@@ -45,13 +45,13 @@ jobs:
4545
with:
4646
mysql version: '5.7'
4747
mysql database: 'testing_db'
48-
mysql root password: ${{secrets.MYSQL_ROOT_PASSWORD}}
48+
mysql root password: ${{ secrets.MYSQL_ROOT_PASSWORD }}
4949
mysql user: 'root'
50-
mysql password: ${{secrets.MYSQL_ROOT_PASSWORD}}
50+
mysql password: ${{ secrets.MYSQL_ROOT_PASSWORD }}
5151

5252
- name: Wait for MySQL
5353
run: |
54-
while ! mysqladmin ping --host=127.0.0.1 --password=123456 --silent; do
54+
while ! mysqladmin ping --host=127.0.0.1 --password=${{ secrets.MYSQL_ROOT_PASSWORD }} --silent; do
5555
sleep 1
5656
done
5757
@@ -61,7 +61,7 @@ jobs:
6161
curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list
6262
sudo apt update
6363
sudo apt install mssql-tools18
64-
/opt/mssql-tools18/bin/sqlcmd -S localhost -U SA -P ${{secrets.SA_PASSWORD}} -Q 'create database testing_db' -C
64+
/opt/mssql-tools18/bin/sqlcmd -S localhost -U SA -P ${{ secrets.SA_PASSWORD }} -Q 'create database testing_db' -C
6565
6666
- name: Install Dependencies
6767
run: composer install --prefer-dist --no-interaction --no-dev

‎.github/workflows/php81.yml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,16 @@ on:
88

99
jobs:
1010
test:
11-
runs-on: ${{ matrix.os }}
11+
runs-on: ${{ matrix.os }}
1212
services:
1313
sql.data:
1414
image: mcr.microsoft.com/mssql/server:2019-latest
1515
env:
16-
SA_PASSWORD: ${{secrets.SA_PASSWORD}}
16+
SA_PASSWORD: ${{ secrets.SA_PASSWORD }}
1717
ACCEPT_EULA: Y
1818
MSSQL_PID: Express
19+
ports:
20+
- "1433:1433"
1921
strategy:
2022
fail-fast: true
2123
matrix:
@@ -43,13 +45,13 @@ jobs:
4345
with:
4446
mysql version: '5.7'
4547
mysql database: 'testing_db'
46-
mysql root password: ${{secrets.MYSQL_ROOT_PASSWORD}}
48+
mysql root password: ${{ secrets.MYSQL_ROOT_PASSWORD }}
4749
mysql user: 'root'
48-
mysql password: ${{secrets.MYSQL_ROOT_PASSWORD}}
50+
mysql password: ${{ secrets.MYSQL_ROOT_PASSWORD }}
4951

5052
- name: Wait for MySQL
5153
run: |
52-
while ! mysqladmin ping --host=127.0.0.1 --password=123456 --silent; do
54+
while ! mysqladmin ping --host=127.0.0.1 --password=${{ secrets.MYSQL_ROOT_PASSWORD }} --silent; do
5355
sleep 1
5456
done
5557
@@ -59,8 +61,8 @@ jobs:
5961
curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list
6062
sudo apt update
6163
sudo apt install mssql-tools18
62-
/opt/mssql-tools18/bin/sqlcmd -S localhost -U SA -P ${{secrets.SA_PASSWORD}} -Q 'create database testing_db' -C
63-
64+
/opt/mssql-tools18/bin/sqlcmd -S localhost -U SA -P ${{ secrets.SA_PASSWORD }} -Q 'create database testing_db' -C
65+
6466
- name: Install Dependencies
6567
run: composer install --prefer-dist --no-interaction --no-dev
6668

‎.github/workflows/php82.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
sql.data:
1515
image: mcr.microsoft.com/mssql/server:2019-latest
1616
env:
17-
SA_PASSWORD: ${{secrets.SA_PASSWORD}}
17+
SA_PASSWORD: ${{ secrets.SA_PASSWORD }}
1818
ACCEPT_EULA: Y
1919
MSSQL_PID: Express
2020
ports:
@@ -28,8 +28,8 @@ jobs:
2828
name: PHP${{matrix.php}} - ${{matrix.os}}
2929

3030
steps:
31-
- name: Clone Repo
32-
uses: actions/checkout@v3
31+
- name: Clone Repos
32+
uses: actions/checkout@v4
3333

3434
- name: Setup PHP
3535
uses: shivammathur/setup-php@v2
@@ -46,13 +46,13 @@ jobs:
4646
with:
4747
mysql version: '5.7'
4848
mysql database: 'testing_db'
49-
mysql root password: ${{secrets.MYSQL_ROOT_PASSWORD}}
49+
mysql root password: ${{ secrets.MYSQL_ROOT_PASSWORD }}
5050
mysql user: 'root'
51-
mysql password: ${{secrets.MYSQL_ROOT_PASSWORD}}
51+
mysql password: ${{ secrets.MYSQL_ROOT_PASSWORD }}
5252

5353
- name: Wait for MySQL
5454
run: |
55-
while ! mysqladmin ping --host=127.0.0.1 --password=123456 --silent; do
55+
while ! mysqladmin ping --host=127.0.0.1 --password=${{ secrets.MYSQL_ROOT_PASSWORD }} --silent; do
5656
sleep 1
5757
done
5858
@@ -62,8 +62,8 @@ jobs:
6262
curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list
6363
sudo apt update
6464
sudo apt install mssql-tools18
65-
/opt/mssql-tools18/bin/sqlcmd -S localhost -U SA -P ${{secrets.SA_PASSWORD}} -Q 'create database testing_db' -C
66-
65+
/opt/mssql-tools18/bin/sqlcmd -S localhost -U SA -P ${{ secrets.SA_PASSWORD }} -Q 'create database testing_db' -C
66+
6767
- name: Install Dependencies
6868
run: composer install --prefer-dist --no-interaction --no-dev
6969

‎.github/workflows/php83.yml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@ jobs:
1414
sql.data:
1515
image: mcr.microsoft.com/mssql/server:2019-latest
1616
env:
17-
SA_PASSWORD: ${{secrets.SA_PASSWORD}}
17+
SA_PASSWORD: ${{ secrets.SA_PASSWORD }}
1818
ACCEPT_EULA: Y
1919
MSSQL_PID: Express
20+
ports:
21+
- "1433:1433"
2022
strategy:
2123
fail-fast: true
2224
matrix:
@@ -44,13 +46,13 @@ jobs:
4446
with:
4547
mysql version: '5.7'
4648
mysql database: 'testing_db'
47-
mysql root password: ${{secrets.MYSQL_ROOT_PASSWORD}}
49+
mysql root password: ${{ secrets.MYSQL_ROOT_PASSWORD }}
4850
mysql user: 'root'
49-
mysql password: ${{secrets.MYSQL_ROOT_PASSWORD}}
51+
mysql password: ${{ secrets.MYSQL_ROOT_PASSWORD }}
5052

5153
- name: Wait for MySQL
5254
run: |
53-
while ! mysqladmin ping --host=127.0.0.1 --password=123456 --silent; do
55+
while ! mysqladmin ping --host=127.0.0.1 --password=${{ secrets.MYSQL_ROOT_PASSWORD }} --silent; do
5456
sleep 1
5557
done
5658
@@ -60,14 +62,14 @@ jobs:
6062
curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list
6163
sudo apt update
6264
sudo apt install mssql-tools18
63-
/opt/mssql-tools18/bin/sqlcmd -S localhost -U SA -P ${{secrets.SA_PASSWORD}} -Q 'create database testing_db' -C
64-
65+
/opt/mssql-tools18/bin/sqlcmd -S localhost -U SA -P ${{ secrets.SA_PASSWORD }} -Q 'create database testing_db' -C
66+
6567
- name: Install Dependencies
6668
run: composer install --prefer-dist --no-interaction --no-dev
67-
69+
6870
- name: Execute Tests
6971
run: phpunit --configuration tests/phpunit.xml
70-
72+
7173
- name: CodeCov
7274
uses: codecov/codecov-action@v4
7375
with:

‎.github/workflows/php84.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
sql.data:
1515
image: mcr.microsoft.com/mssql/server:2019-latest
1616
env:
17-
SA_PASSWORD: ${{secrets.SA_PASSWORD}}
17+
SA_PASSWORD: ${{ secrets.SA_PASSWORD }}
1818
ACCEPT_EULA: Y
1919
MSSQL_PID: Express
2020
ports:
@@ -29,7 +29,7 @@ jobs:
2929

3030
steps:
3131
- name: Clone Repo
32-
uses: actions/checkout@v3
32+
uses: actions/checkout@v4
3333

3434
- name: Setup PHP
3535
uses: shivammathur/setup-php@v2
@@ -46,13 +46,13 @@ jobs:
4646
with:
4747
mysql version: '5.7'
4848
mysql database: 'testing_db'
49-
mysql root password: ${{secrets.MYSQL_ROOT_PASSWORD}}
49+
mysql root password: ${{ secrets.MYSQL_ROOT_PASSWORD }}
5050
mysql user: 'root'
51-
mysql password: ${{secrets.MYSQL_ROOT_PASSWORD}}
51+
mysql password: ${{ secrets.MYSQL_ROOT_PASSWORD }}
5252

5353
- name: Wait for MySQL
5454
run: |
55-
while ! mysqladmin ping --host=127.0.0.1 --password=123456 --silent; do
55+
while ! mysqladmin ping --host=127.0.0.1 --password=${{ secrets.MYSQL_ROOT_PASSWORD }} --silent; do
5656
sleep 1
5757
done
5858
@@ -62,8 +62,8 @@ jobs:
6262
curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list
6363
sudo apt update
6464
sudo apt install mssql-tools18
65-
/opt/mssql-tools18/bin/sqlcmd -S localhost -U SA -P ${{secrets.SA_PASSWORD}} -Q 'create database testing_db' -C
66-
65+
/opt/mssql-tools18/bin/sqlcmd -S localhost -U SA -P ${{ secrets.SA_PASSWORD }} -Q 'create database testing_db' -C
66+
6767
- name: Install Dependencies
6868
run: composer install --prefer-dist --no-interaction --no-dev
6969

0 commit comments

Comments
 (0)