Skip to content

Commit

Permalink
Update dependencies composer.json (#253)
Browse files Browse the repository at this point in the history
  • Loading branch information
terabytesoftw authored Oct 16, 2022
1 parent 117a502 commit 4ffb09f
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 79 deletions.
18 changes: 17 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jobs:
env:
extensions: fileinfo
key: cache-v1
YII_C3: true

runs-on: ${{ matrix.os }}

Expand All @@ -45,6 +46,7 @@ jobs:
php:
- 8.0
- 8.1
- 8.2

steps:
- name: Checkout
Expand All @@ -57,6 +59,7 @@ jobs:
extensions: ${{ env.extensions }}
ini-values: date.timezone='UTC'
tools: composer:v2
coverage: pcov

- name: Determine composer cache directory on Linux
if: matrix.os == 'ubuntu-latest'
Expand All @@ -80,7 +83,20 @@ jobs:
- name: Install dependencies with composer
run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi

- name: Run tests with codeception
- name: Run tests codeception
if: matrix.os != 'ubuntu-latest' || matrix.php != '8.0'
run: |
php -S 127.0.0.1:8080 -t public > ./runtime/yii.log 2>&1 &
vendor/bin/codecept run
- name: Run tests codeception with coverage
if: matrix.os == 'ubuntu-latest' && matrix.php == '8.0'
run: |
php -S 127.0.0.1:8080 -t public > ./runtime/yii.log 2>&1 &
vendor/bin/codecept run --coverage-xml
- name: Upload coverage to codecov
if: matrix.os == 'ubuntu-latest' && matrix.php == '8.0'
uses: codecov/codecov-action@v3
with:
file: tests/_output/coverage.xml
40 changes: 0 additions & 40 deletions .scrutinizer.yml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
[![Total Downloads](https://poser.pugx.org/yiisoft/app/downloads.png)](https://packagist.org/packages/yiisoft/app)
[![build](https://github.com/yiisoft/app/workflows/build/badge.svg)](https://github.com/yiisoft/app/actions)
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/yiisoft/app/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/yiisoft/app/?branch=master)
[![Code Coverage](https://scrutinizer-ci.com/g/yiisoft/app/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/yiisoft/app/?branch=master)
[![Code Coverage](https://codecov.io/gh/yiisoft/app/branch/master/graph/badge.svg?token=TDZ2bErTcN)](https://codecov.io/gh/yiisoft/app)
[![static analysis](https://github.com/yiisoft/app/workflows/static%20analysis/badge.svg)](https://github.com/yiisoft/app/actions?query=workflow%3A%22static+analysis%22)
[![type-coverage](https://shepherd.dev/github/yiisoft/app/coverage.svg)](https://shepherd.dev/github/yiisoft/app)

Expand Down
2 changes: 1 addition & 1 deletion autoload.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
$dotenv = Dotenv::createImmutable(__DIR__);
$dotenv->load();

$_ENV['YII_ENV'] = empty($_ENV['YII_ENV']) ? null : (string)$_ENV['YII_ENV'];
$_ENV['YII_ENV'] = empty($_ENV['YII_ENV']) ? null : $_ENV['YII_ENV'];
$_SERVER['YII_ENV'] = $_ENV['YII_ENV'];

$_ENV['YII_DEBUG'] = filter_var(
Expand Down
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,27 +26,27 @@
"psr/container": "^2.0",
"psr/http-message": "^1.0",
"psr/http-server-handler": "^1.0",
"symfony/console": "^5.3",
"symfony/console": "6.0",
"vlucas/phpdotenv": "^5.3",
"yiisoft/aliases": "^2.0",
"yiisoft/assets": "^2.0",
"yiisoft/assets": "^2.1",
"yiisoft/cache": "^2.0",
"yiisoft/cache-file": "^2.0",
"yiisoft/config": "^1.1",
"yiisoft/csrf": "^1.2",
"yiisoft/data-response": "^1.0",
"yiisoft/definitions": "^2.0",
"yiisoft/di": "^1.0",
"yiisoft/di": "^1.1",
"yiisoft/error-handler": "^2.0",
"yiisoft/factory": "^1.0",
"yiisoft/files": "^2.0",
"yiisoft/html": "^2.0",
"yiisoft/html": "^2.5",
"yiisoft/http": "^1.2",
"yiisoft/i18n": "^1.0.0",
"yiisoft/i18n": "^1.1",
"yiisoft/log": "^2.0",
"yiisoft/log-target-file": "^2.0",
"yiisoft/router": "^1.0",
"yiisoft/router-fastroute": "^1.0",
"yiisoft/router": "^1.2",
"yiisoft/router-fastroute": "^1.1",
"yiisoft/view": "^6.0",
"yiisoft/yii-console": "^1.3",
"yiisoft/yii-debug": "^3.0@dev",
Expand Down
28 changes: 0 additions & 28 deletions phpunit.xml.dist

This file was deleted.

2 changes: 1 addition & 1 deletion public/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use Yiisoft\Yii\Runner\Http\HttpApplicationRunner;

if (getenv('YII_ENV') === 'test') {
if (getenv('YII_C3')) {
$c3 = dirname(__DIR__) . '/c3.php';
if (file_exists($c3)) {
require_once $c3;
Expand Down

0 comments on commit 4ffb09f

Please sign in to comment.