Skip to content

Commit

Permalink
Merge pull request #25 from ecphp/use-ecphp-php-conventions
Browse files Browse the repository at this point in the history
Use `ecphp/php-conventions`.
  • Loading branch information
drupol authored Jul 5, 2021
2 parents 3b6e53f + 2af8b60 commit 9275caa
Show file tree
Hide file tree
Showing 53 changed files with 603 additions and 336 deletions.
34 changes: 24 additions & 10 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,11 +1,25 @@
/.github export-ignore
/build export-ignore
/docker export-ignore
/docs export-ignore
/features export-ignore
/spec export-ignore
/docs/ export-ignore
/tests/ export-ignore
.github/ export-ignore
.editorconfig export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.scrutinizer.yml export-ignore
infection.json.dist export-ignore
grumphp.yml.dist export-ignore
phpspec.yml.dist export-ignore
/src/Tests export-ignore
/tests export-ignore
/.auto-changelog export-ignore
/.editorconfig export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.scrutinizer.yml export-ignore
/behat.yaml export-ignore
/behat.yaml.dist export-ignore
/docker-compose.yaml export-ignore
/grumphp.yml export-ignore
/grumphp.yml.dist export-ignore
/infection.json export-ignore
/infection.json.dist export-ignore
/phpspec.yml export-ignore
/phpspec.yml.dist export-ignore
/phpstan.neon export-ignore
/phpstan.neon.dist export-ignore
/psalm.xml export-ignore
4 changes: 2 additions & 2 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:
strategy:
fail-fast: false
matrix:
operating-system: [ubuntu-latest, windows-latest, macOS-latest]
php-versions: ['7.1', '7.2', '7.3', '7.4']
operating-system: [ubuntu-latest, windows-latest]
php-versions: ['7.4']

steps:
- name: Set git to use LF
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ composer.lock
grumphp.yml
phpspec.yml
/build/
.php_cs.cache
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BSD 3-Clause License

Copyright (c) 2020, ECPHP
Copyright (c) 2019-2021, ECPHP.
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
112 changes: 57 additions & 55 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,58 +1,60 @@
{
"name": "ecphp/cas-lib",
"type": "library",
"description": "CAS Lib, a standard library for CAS authentication.",
"keywords": [
"authentication",
"cas",
"psr",
"single-sign-on"
],
"license": "BSD-3-Clause",
"require": {
"php": ">= 7.1.3",
"ext-dom": "*",
"ext-json": "*",
"ext-libxml": "*",
"ext-simplexml": "*",
"league/uri-query-parser": "^1.0",
"openlss/lib-array2xml": "^1.0",
"psr/cache": "^1.0.1",
"psr/http-client": "^1.0.0",
"psr/http-factory": "^1.0.1",
"psr/http-message": "^1.0.1",
"psr/log": "^1.1.1 || ^1.1.0"
},
"require-dev": {
"drupol/php-conventions": "^1.7.2 || ^1.8.6",
"friends-of-phpspec/phpspec-code-coverage": "^4.3.2",
"infection/infection": "^0.12.2 || ^0.13.6 || ^0.14.4 || ^0.15.3",
"monolog/monolog": "^1.0",
"nyholm/psr7": "^1.2.1",
"nyholm/psr7-server": "^0.4.1 || ^1.0.0",
"phpspec/phpspec": "^5.1.2 || ^6.2.1",
"phpspec/prophecy": "^1.10.1",
"phpstan/phpstan-strict-rules": "^0.12",
"symfony/cache": "^4.3.9 || ^4.4.2",
"symfony/http-client": "^4.4.2",
"vimeo/psalm": "^3.12 || ^4.0"
},
"autoload": {
"psr-4": {
"EcPhp\\CasLib\\": "./src/"
"name": "ecphp/cas-lib",
"type": "library",
"description": "CAS Lib, a standard library for CAS authentication.",
"keywords": [
"authentication",
"cas",
"psr",
"single-sign-on"
],
"license": "BSD-3-Clause",
"require": {
"php": ">= 7.4",
"ext-dom": "*",
"ext-json": "*",
"ext-libxml": "*",
"ext-simplexml": "*",
"league/uri-query-parser": "^1.0",
"openlss/lib-array2xml": "^1.0",
"psr/cache": "^1.0.1",
"psr/http-client": "^1.0",
"psr/http-client-implementation": "^1",
"psr/http-factory": "^1.0.1",
"psr/http-factory-implementation": "^1",
"psr/http-message": "^1.0",
"psr/http-message-implementation": "^1",
"psr/log": "^1.1"
},
"require-dev": {
"ecphp/php-conventions": "^1",
"friends-of-phpspec/phpspec-code-coverage": "^6.0.0",
"infection/infection": "^0.23",
"infection/phpspec-adapter": "^0.1.2",
"monolog/monolog": "^1.0",
"nyholm/psr7": "^1.4",
"nyholm/psr7-server": "^1.0.0",
"phpspec/phpspec": "^7",
"phpstan/phpstan-strict-rules": "^0.12",
"symfony/cache": "^5.2",
"symfony/http-client": "^5.2"
},
"autoload": {
"psr-4": {
"EcPhp\\CasLib\\": "./src/"
}
},
"autoload-dev": {
"psr-4": {
"spec\\EcPhp\\CasLib\\": "./spec/EcPhp/CasLib/",
"tests\\EcPhp\\CasLib\\": "./tests/"
}
},
"scripts": {
"changelog-unreleased": "docker-compose run auto_changelog -c .auto-changelog -u",
"changelog-version": "docker-compose run auto_changelog -c .auto-changelog -v",
"grumphp": "./vendor/bin/grumphp run",
"phpinsights": "./vendor/bin/phpinsights analyse src/",
"phpspec": "./vendor/bin/phpspec run"
}
},
"autoload-dev": {
"psr-4": {
"spec\\EcPhp\\CasLib\\": "./spec/EcPhp/CasLib/",
"tests\\EcPhp\\CasLib\\": "./tests/"
}
},
"scripts": {
"changelog-unreleased": "docker-compose run auto_changelog -c .auto-changelog -u",
"changelog-version": "docker-compose run auto_changelog -c .auto-changelog -v",
"grumphp": "./vendor/bin/grumphp run",
"phpinsights": "./vendor/bin/phpinsights analyse src/",
"phpspec": "./vendor/bin/phpspec run"
}
}
2 changes: 1 addition & 1 deletion grumphp.yml.dist
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
imports:
- { resource: vendor/drupol/php-conventions/config/php71/grumphp.yml }
- { resource: vendor/ecphp/php-conventions/config/php73/grumphp.yml }

parameters:
extra_tasks:
Expand Down
Loading

0 comments on commit 9275caa

Please sign in to comment.