Skip to content

Commit

Permalink
Merge pull request #14 from platformsh/gh-actions
Browse files Browse the repository at this point in the history
Switch to GitHub Actions and bump PHP version.
  • Loading branch information
chadwcarlson authored Dec 10, 2020
2 parents 1dc7a61 + 01fed0b commit eed3431
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 51 deletions.
43 changes: 0 additions & 43 deletions .circleci/config.yml

This file was deleted.

24 changes: 24 additions & 0 deletions .github/workflows/quality-assurance.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
name: Quality Assurance
on:
push: ~
pull_request: ~

jobs:
phpunit:
name: PHPUnit tests on ${{ matrix.php }} ${{ matrix.composer-flags }}
runs-on: ubuntu-latest
strategy:
matrix:
php: [ '7.2', '7.3', '7.4', '8.0' ]
composer-flags: [ '' ]
phpunit-flags: [ '--coverage-text' ]
steps:
- uses: actions/checkout@v2
- uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
coverage: xdebug
tools: composer:v2
- run: composer update --no-progress ${{ matrix.composer-flags }}
- run: vendor/bin/phpunit ${{ matrix.phpunit-flags }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
/vendor/
composer.lock
.phpunit.result.cache
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Laravel bridge for Platform.sh

[![CircleCI Status](https://circleci.com/gh/platformsh/laravel-bridge.svg?style=shield&circle-token=:circle-token)](https://circleci.com/gh/platformsh/laravel-bridge)

This simple bridge library connects a Laravel-based application to [Platform.sh](https://platform.sh/). In the typical case it should be completely fire-and-forget.

Laravel prefers all configuration to come in through environment variables with specific names in a specific format. Platform.sh provides configuration information as environment variables in a different specific format. This library handles mapping the Platform.sh variables to the format Laravel expects for common values.
Expand Down
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
}
],
"require": {
"platformsh/config-reader": "^2.1.0"
"php": ">=7.2",
"platformsh/config-reader": "^2.4.0"
},
"autoload": {
"files": ["platformsh-laravel-env.php"]
Expand All @@ -26,6 +27,6 @@
}
},
"require-dev": {
"phpunit/phpunit": "^7.0"
"phpunit/phpunit": "^8.5"
}
}
2 changes: 1 addition & 1 deletion tests/LaravelBridgeDatabaseTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class LaravelBridgeDatabaseTest extends TestCase

protected $relationships;

public function setUp()
public function setUp(): void
{
parent::setUp();

Expand Down
2 changes: 1 addition & 1 deletion tests/LaravelBridgeMailTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class LaravelBridgeMailTest extends TestCase
/** @var string */
protected $host;

public function setUp()
public function setUp(): void
{
parent::setUp();

Expand Down
2 changes: 1 addition & 1 deletion tests/LaravelBridgeRedisCacheTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class LaravelBridgeRedisCacheTest extends TestCase

protected $relationships;

public function setUp()
public function setUp(): void
{
parent::setUp();

Expand Down
2 changes: 1 addition & 1 deletion tests/LaravelBridgeRedisSessionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class LaravelBridgeRedisSessionTest extends TestCase

protected $relationships;

public function setUp()
public function setUp(): void
{
parent::setUp();

Expand Down

0 comments on commit eed3431

Please sign in to comment.