Skip to content

Commit 8ec47c9

Browse files
authored
Upgrade gitamp to use latest amphp packages (#46)
* Upgrade gitamp to use latest amphp packages * Upgrade dependencies * Drop nightly build for now * Update .scrutinizer.yml * Test new scrutinizer php analysis engine * Attempt to run scrutinizer on 7.4 for all nodes * Attempt setting up a multi-stage travis CI run * Add editorconfig * Require dependency checker, phpcs and missing amphp dependencies * Update dependencies, sort composer packages
1 parent fe79249 commit 8ec47c9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+6116
-2271
lines changed

.editorconfig

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
root = true
2+
3+
[*]
4+
end_of_line = lf
5+
charset = utf-8
6+
trim_trailing_whitespace = true
7+
insert_final_newline = true
8+
9+
[*.{diff,md}]
10+
trim_trailing_whitespace = false
11+
12+
[*.php]
13+
indent_style = space
14+
indent_size = 4
15+
16+
[*.{js,json,html,twig}]
17+
indent_style = space
18+
indent_size = 4

.php_cs

-17
This file was deleted.

.scrutinizer.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,9 @@ tools:
4040
build:
4141
environment:
4242
php:
43-
version: "7.0"
43+
version: "7.4"
44+
nodes:
45+
analysis:
46+
tests:
47+
override:
48+
- php-scrutinizer-run

.travis.yml

+19-18
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
language: php
22

33
php:
4-
- '7.0'
5-
- '7.1'
6-
- '7.2'
7-
- nightly
4+
- '7.4'
85

9-
services:
10-
- redis-server
11-
12-
before_script:
13-
- travis_retry composer self-update
14-
- travis_retry composer update --no-interaction
15-
16-
script:
17-
- phpdbg -qrr vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
18-
- vendor/bin/fqn-check src
19-
20-
after_script:
21-
- wget https://scrutinizer-ci.com/ocular.phar
22-
- php ocular.phar code-coverage:upload --format=php-clover coverage.clover
6+
jobs:
7+
include:
8+
- stage: Dependencies
9+
name: "Dependency Checks"
10+
before_script:
11+
- travis_retry composer self-update
12+
- travis_retry composer update --no-interaction
13+
script: ./vendor/bin/composer-require-checker
14+
- stage: Tests
15+
name: "Unit Tests and Coverage"
16+
before_script:
17+
- travis_retry composer self-update
18+
- travis_retry composer update --no-interaction
19+
script:
20+
- phpdbg -qrr vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
21+
after_script:
22+
- wget https://scrutinizer-ci.com/ocular.phar
23+
- php ocular.phar code-coverage:upload --format=php-clover coverage.clover

build/minify-resources.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php declare(strict_types = 1);
1+
<?php declare(strict_types=1);
22

33
namespace ekinhbayar\GitAmp\Build;
44

composer.json

+62-49
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,66 @@
11
{
2-
"name": "ekinhbayar/gitamp",
3-
"description": "Listen ambient music generated by events across github.",
4-
"keywords": [
5-
"audio",
6-
"events",
7-
"github",
8-
"async",
9-
"non-blocking"
10-
],
11-
"license": "MIT",
12-
"authors": [
13-
{
14-
"name": "Ekin H. Bayar",
15-
"email": "[email protected]",
16-
"role": "Developer"
2+
"name": "ekinhbayar/gitamp",
3+
"description": "Listen ambient music generated by events across github.",
4+
"keywords": [
5+
"audio",
6+
"events",
7+
"github",
8+
"async",
9+
"non-blocking"
10+
],
11+
"license": "MIT",
12+
"authors": [
13+
{
14+
"name": "Ekin H. Bayar",
15+
"email": "[email protected]",
16+
"role": "Developer"
17+
},
18+
{
19+
"name": "Pieter Hordijk",
20+
"email": "[email protected]",
21+
"homepage": "https://pieterhordijk.com",
22+
"role": "Developer"
23+
}
24+
],
25+
"minimum-stability": "dev",
26+
"prefer-stable": true,
27+
"require": {
28+
"amphp/amp": "^2",
29+
"amphp/http": "^1.6",
30+
"amphp/http-client": "^4.5",
31+
"amphp/http-server": "^2.1",
32+
"amphp/http-server-router": "^1.0",
33+
"amphp/http-server-static-content": "^1.0",
34+
"amphp/log": "^1.1",
35+
"amphp/websocket": "^1.0",
36+
"amphp/websocket-server": "^2.0",
37+
"daverandom/exceptional-json": "^1",
38+
"ext-json": "*",
39+
"monolog/monolog": "^2",
40+
"nikic/fast-route": "^1",
41+
"php": "^7",
42+
"psr/log": "^1",
43+
"rdlowrey/auryn": "^1"
1744
},
18-
{
19-
"name": "Pieter Hordijk",
20-
"email": "[email protected]",
21-
"homepage": "https://pieterhordijk.com",
22-
"role": "Developer"
23-
}
24-
],
25-
"minimum-stability": "dev",
26-
"prefer-stable": true,
27-
"require": {
28-
"php": "^7",
29-
"psr/log": "^1",
30-
"amphp/amp": "^2",
31-
"monolog/monolog": "^1",
32-
"daverandom/exceptional-json": "^1",
33-
"nikic/fast-route": "^1",
34-
"rdlowrey/auryn": "^1",
35-
"amphp/aerys": "master",
36-
"amphp/artax": "master"
37-
},
38-
"require-dev": {
39-
"phpunit/phpunit": "^6",
40-
"kelunik/fqn-check": "^0.1.0",
41-
"matthiasmullie/minify": "^1.3"
42-
},
43-
"autoload": {
44-
"psr-4": {
45-
"ekinhbayar\\GitAmp\\": "src/"
46-
}
47-
},
48-
"autoload-dev": {
49-
"psr-4": {
50-
"ekinhbayar\\GitAmpTests\\": "tests/"
45+
"require-dev": {
46+
"maglnet/composer-require-checker": "^2.1",
47+
"matthiasmullie/minify": "^1.3",
48+
"object-calisthenics/phpcs-calisthenics-rules": "^3.7",
49+
"phpunit/phpunit": "^9",
50+
"slevomat/coding-standard": "^6.0@dev",
51+
"squizlabs/php_codesniffer": "^3.5"
52+
},
53+
"autoload": {
54+
"psr-4": {
55+
"ekinhbayar\\GitAmp\\": "src/"
56+
}
57+
},
58+
"autoload-dev": {
59+
"psr-4": {
60+
"ekinhbayar\\GitAmpTests\\": "tests/"
61+
}
62+
},
63+
"config": {
64+
"sort-packages": true
5165
}
52-
}
5366
}

0 commit comments

Comments
 (0)