Skip to content

Commit 027b6d9

Browse files
authored
Merge pull request #2 from phalcon/review
Update code base
2 parents 7645023 + 6f91f1b commit 027b6d9

File tree

23 files changed

+639
-506
lines changed

23 files changed

+639
-506
lines changed

.github/workflows/tests.yml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,17 @@ on: [push, pull_request]
55
jobs:
66
run-tests:
77
name: PHP ${{ matrix.php-versions }}
8+
9+
services:
10+
redis:
11+
image: redis:5-alpine
12+
ports:
13+
- 6379
14+
memcached:
15+
image: memcached:1.5-alpine
16+
ports:
17+
- 11211
18+
819
runs-on: ubuntu-latest
920
env:
1021
extensions: mbstring, intl, json, phalcon4, redis, mongodb, xdebug
@@ -53,8 +64,15 @@ jobs:
5364
run: composer install --prefer-dist --no-suggest
5465

5566
- name: Run test suites
67+
env:
68+
DATA_REDIS_HOST: '127.0.0.1'
69+
DATA_REDIS_PORT: ${{ job.services.redis.ports['6379'] }}
70+
DATA_MEMCACHED_HOST: '127.0.0.1'
71+
DATA_MEMCACHED_PORT: ${{ job.services.memcached.ports['11211'] }}
5672
if: success()
57-
run: vendor/bin/codecept run --coverage-xml=coverage-${{ matrix.php-versions }}.xml
73+
run: |
74+
cp tests/.env.example tests/.env
75+
vendor/bin/codecept run --coverage-xml=coverage-${{ matrix.php-versions }}.xml
5876
5977
- name: Upload coverage to Codecov
6078
if: success()

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
composer.phar
22
/vendor/
3+
.env
34

45
# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
56
# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file

README.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Usage examples of the adapters available here:
55
## Memcached
66

77
Stores the parsed annotations to Memcached.
8-
This adapter uses a `Phalcon\Cache\Backend\Libmemcached` backend to store the cached content:
8+
This adapter uses a `Phalcon\Cache\Adapter\Libmemcached` backend to store the cached content:
99

1010
```php
11-
use Phalcon\Annotations\Adapter\Memcached;
11+
use Phalcon\Incubator\Annotations\Adapter\Memcached;
1212

1313
$di->set(
1414
'annotations',
@@ -29,10 +29,10 @@ $di->set(
2929
## Redis
3030

3131
Stores the parsed annotations to Redis.
32-
This adapter uses a `Phalcon\Cache\Backend\Redis` backend to store the cached content:
32+
This adapter uses a `Phalcon\Cache\Adapter\Redis` backend to store the cached content:
3333

3434
```php
35-
use Phalcon\Annotations\Adapter\Redis;
35+
use Phalcon\Incubator\Annotations\Adapter\Redis;
3636

3737
$di->set(
3838
'annotations',
@@ -48,4 +48,3 @@ $di->set(
4848
}
4949
);
5050
```
51-

codeception.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ coverage:
1717

1818
params:
1919
# get params from environment vars
20-
- env
20+
- tests/.env

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
"codeception/codeception": "^4.1",
3737
"codeception/module-asserts": "^1.0.0",
3838
"phpstan/phpstan": "^0.12.18",
39-
"vlucas/phpdotenv": "^2.5",
40-
"ocramius/package-versions": "1.4.0",
39+
"vlucas/phpdotenv": "^4.1",
4140
"phpunit/php-token-stream": "3.1.2",
4241
"webmozart/glob": "4.1.0"
4342
},

0 commit comments

Comments
 (0)