Skip to content

Commit 7955917

Browse files
authored
Merge pull request #2 from Codeception/develop
Added feedback Naktibalda
2 parents 83e4a57 + 6d1d567 commit 7955917

File tree

7 files changed

+26
-4500
lines changed

7 files changed

+26
-4500
lines changed

.github/workflows/tests.yml

+2-13
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,10 @@ jobs:
3737
uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
3838
with:
3939
php-version: ${{ matrix.php-versions }}
40-
extensions: mbstring, dom, zip, phalcon4, mysql #use phalcon3 for the phalcon 3.x.
40+
extensions: mbstring, dom, zip, phalcon4, mysql
4141
coverage: xdebug #optional
42-
- name: Get composer cache directory
43-
id: composer-cache
44-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
45-
- name: Cache composer dependencies
46-
uses: actions/cache@v1
47-
with:
48-
path: ${{ steps.composer-cache.outputs.dir }}
49-
# Use composer.json for key, if composer.lock is not committed.
50-
# key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
51-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
52-
restore-keys: ${{ runner.os }}-composer-
5342
- name: Install Composer dependencies
54-
run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader --ignore-platform-reqs
43+
run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
5544
- name: Prepare the application
5645
run: php -r "file_exists('.env') || copy('.env.example', '.env');"
5746
- name: Run Tests

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
/vendor/
33
/framework-tests
44
.env
5+
composer.lock

CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
#### 1.0.1
2+
3+
- Removed composer.lock
4+
- Updated dependencies
5+
- Updated SQL schema
6+
17
#### 1.0.0
28

39
* Support Phalcon 4.0.0-RC.3

composer.json

+15-9
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,33 @@
11
{
22
"name":"codeception/module-phalcon4",
33
"description":"Codeception module for Phalcon 4 framework",
4-
"keywords":["codeception", "phalcon"],
4+
"keywords":["codeception", "phalcon", "phalcon4"],
55
"homepage":"https://codeception.com/",
66
"type":"library",
77
"license":"MIT",
8-
"authors":[
8+
"authors": [
99
{
10-
"name":"Ruud Boon"
10+
"name": "Phalcon Team",
11+
"email": "[email protected]",
12+
"homepage": "https://phalcon.io/en/team"
13+
},
14+
{
15+
"name": "Codeception Team",
16+
"email": "[email protected]",
17+
"homepage": "http://codeception.com/"
1118
}
1219
],
13-
"minimum-stability": "RC",
14-
1520
"require": {
1621
"php": ">=7.2.0 <8.0",
17-
"codeception/lib-innerbrowser": "dev-master | ^1.0",
18-
"codeception/codeception": "4.0.x-dev | ^4.0",
22+
"ext-phalcon": ">=4",
23+
"codeception/lib-innerbrowser": "^1.0",
24+
"codeception/codeception": "^4.0",
1925
"vlucas/phpdotenv": "^4.1"
2026
},
2127
"require-dev": {
2228
"codeception/util-robohelpers": "dev-master",
23-
"codeception/module-asserts": "dev-master | ^1.0",
24-
"codeception/module-phpbrowser": "dev-master | ^1.0",
29+
"codeception/module-asserts": "^1.0",
30+
"codeception/module-phpbrowser": "^1.0",
2531
"squizlabs/php_codesniffer": "^3.4",
2632
"vimeo/psalm": "^3.6",
2733
"codeception/module-db": "^1.0"

0 commit comments

Comments
 (0)