Skip to content

Commit e4ebcd9

Browse files
authored
Merge pull request #4 from silinternational/develop
Release 1.1.0 Upgrade to PHP8 and remove fake-bower-assets dependency
2 parents 85ca2c1 + 1c5c4e3 commit e4ebcd9

File tree

5 files changed

+37
-3
lines changed

5 files changed

+37
-3
lines changed

Diff for: Makefile

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
default: clean deps lint
2+
3+
clean:
4+
docker-compose kill
5+
docker-compose rm -f
6+
7+
deps:
8+
docker-compose run --rm cli bash -c "composer install"
9+
10+
depsupdate:
11+
docker-compose run --rm cli bash -c "composer update && composer show -D > versions.json"
12+
13+
lint:
14+
docker-compose run --rm cli bash -c "php -l src/Codeception/TestCase/Test.php && php -l src/yii/test/ActiveFixture.php"

Diff for: composer.json

+13-2
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,23 @@
1212
"require": {
1313
"php": ">=5.6.0",
1414
"yiisoft/yii2": "^2.0.5",
15-
"codeception/codeception": "^2.2"
15+
"codeception/codeception": ">=2.2"
1616
},
1717
"autoload": {
1818
"psr-4": {
1919
"Sil\\Codeception\\": "src/Codeception/",
2020
"Sil\\yii\\": "src/yii/"
2121
}
22-
}
22+
},
23+
"config": {
24+
"allow-plugins": {
25+
"yiisoft/yii2-composer": true
26+
}
27+
},
28+
"repositories": [
29+
{
30+
"type": "composer",
31+
"url": "https://asset-packagist.org"
32+
}
33+
]
2334
}

Diff for: docker-compose.yml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
version: "3"
2+
services:
3+
cli:
4+
image: silintl/php8:8.1
5+
volumes:
6+
- ./:/data
7+
working_dir: /data

Diff for: src/Codeception/TestCase/Test.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
namespace Sil\Codeception\TestCase;
33

4-
use Codeception\TestCase\Test as CodeceptionTestCaseTest;
4+
use Codeception\Test\Unit as CodeceptionTestCaseTest;
55

66
/**
77
* Class Test

Diff for: versions.json

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
codeception/codeception 5.0.2 BDD-style testing framework
2+
yiisoft/yii2 2.0.46 Yii PHP Framework Version 2

0 commit comments

Comments
 (0)