Skip to content

Commit

Permalink
Merge pull request #108 from Slamdunk/functioning_examples
Browse files Browse the repository at this point in the history
Make the full config example functional, and test it
  • Loading branch information
Slamdunk authored Oct 27, 2023
2 parents bd60ff1 + 1f8b99c commit abe6634
Show file tree
Hide file tree
Showing 17 changed files with 516 additions and 96 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,6 @@ jobs:

- name: Test with PHPUnit
run: make unit

- name: Test examples
run: make check-example
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.PHONY: *

default: unit cs static-analysis ## all the things
default: unit cs static-analysis check-example ## all the things

help:
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
Expand All @@ -9,11 +9,15 @@ unit: ## run unit tests
vendor/bin/phpunit

cs: ## verify code style rules
vendor/bin/phpcbf || true
vendor/bin/phpcs

static-analysis: ## verify that no static analysis issues were introduced
vendor/bin/psalm

check-example:
test/example/check-example.sh

bc-check: ## check for backwards compatibility breaks
mkdir -p /tmp/bc-check
composer require --no-plugins -d/tmp/bc-check roave/backward-compatibility-check
Expand Down
13 changes: 8 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{
"name": "roave/psr-container-doctrine",
"type": "library",
"description": "Doctrine Factories for PSR-11 Containers",
"homepage": "https://github.com/Roave/psr-container-doctrine",
"license" : "BSD-2-Clause",
"license": "BSD-2-Clause",
"type": "library",
"authors": [
{
"name": "Ben Scholzen",
"name": "Ben Scholzen",
"homepage": "https://github.com/dasprid"
},
{
Expand All @@ -15,6 +14,7 @@
"homepage": "https://github.com/asgrim"
}
],
"homepage": "https://github.com/Roave/psr-container-doctrine",
"require": {
"php": "~8.1.0 || ~8.2.0",
"doctrine/annotations": "^1.14.2 || ^2.0",
Expand All @@ -29,7 +29,10 @@
"psr/container": "^1.0 || ^2.0"
},
"require-dev": {
"ext-sqlite3": "*",
"doctrine/coding-standard": "^12.0.0",
"illuminate/container": "^10.29",
"laminas/laminas-servicemanager": "^3.15",
"phpunit/phpunit": "^10.4.2",
"psalm/plugin-phpunit": "^0.18.4",
"symfony/yaml": "^6.3.3",
Expand All @@ -47,8 +50,8 @@
},
"config": {
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true,
"composer/package-versions-deprecated": true,
"dealerdirect/phpcodesniffer-composer-installer": true,
"ocramius/package-versions": true
},
"platform": {
Expand Down
Loading

0 comments on commit abe6634

Please sign in to comment.