Skip to content

Commit

Permalink
Merge branch 'main' into gateway
Browse files Browse the repository at this point in the history
* main:
  [Mailer] New Component and Contract (#190)
  [Mailer] New Component and Contract (#189)
  House Keeping (#188)
  [HttpHandler] Component (#187)
  [Container] New Component (#182)
  [Cookie] New Component & Contract (#181)
  [Pager] Doctrine Bridge (#175)
  fuckery (#174)
  [Money] Add Twig Bridge (#173)
  docs
  • Loading branch information
JoshuaEstes committed Dec 8, 2023
2 parents bace27f + 1fd79bb commit 19f8198
Show file tree
Hide file tree
Showing 232 changed files with 4,635 additions and 221 deletions.
4 changes: 4 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,21 @@ docs/ @JoshuaEstes
# Each component/contract needs a Team
/src/SonsOfPHP/**/Cache @JoshuaEstes
/src/SonsOfPHP/**/Clock @JoshuaEstes
/src/SonsOfPHP/**/Container @JoshuaEstes
/src/SonsOfPHP/**/Cookie @JoshuaEstes
/src/SonsOfPHP/**/Common @JoshuaEstes
/src/SonsOfPHP/**/Cqrs @JoshuaEstes
/src/SonsOfPHP/**/EventDispatcher @JoshuaEstes
/src/SonsOfPHP/**/EventSourcing @JoshuaEstes
/src/SonsOfPHP/**/FeatureToggle @JoshuaEstes
/src/SonsOfPHP/**/Filesystem @JoshuaEstes
/src/SonsOfPHP/**/HttpFactory @JoshuaEstes
/src/SonsOfPHP/**/HttpHandler @JoshuaEstes
/src/SonsOfPHP/**/HttpMessage @JoshuaEstes
/src/SonsOfPHP/**/Json @JoshuaEstes
/src/SonsOfPHP/**/Link @JoshuaEstes
/src/SonsOfPHP/**/Logger @JoshuaEstes
/src/SonsOfPHP/**/Mailer @JoshuaEstes
/src/SonsOfPHP/**/Money @JoshuaEstes
/src/SonsOfPHP/**/Pager @JoshuaEstes
/src/SonsOfPHP/**/Version @JoshuaEstes
16 changes: 16 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ Clock:
- docs/components/clock/*
- src/SonsOfPHP/**/Clock/*

Container:
- docs/components/container/*
- src/SonsOfPHP/**/Container/*

Cookie:
- docs/components/cookie/*
- src/SonsOfPHP/**/Cookie/*

Common:
- docs/components/common/*
- src/SonsOfPHP/**/Common/*
Expand Down Expand Up @@ -38,6 +46,10 @@ HttpFactory:
- docs/components/http-factory/*
- src/SonsOfPHP/**/HttpFactory/*

HttpHandler:
- docs/components/http-handler/*
- src/SonsOfPHP/**/HttpHandler/*

HttpMessage:
- docs/components/http-message/*
- src/SonsOfPHP/**/HttpMessage/*
Expand All @@ -54,6 +66,10 @@ Logger:
- docs/components/logger/*
- src/SonsOfPHP/**/Logger/*

Mailer:
- docs/components/mailer/*
- src/SonsOfPHP/**/Mailer/*

Money:
- docs/components/money/*
- src/SonsOfPHP/**/Money/*
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/docs/coverage/
/docs/infection/
/site/
vendor/
/.php-cs-fixer.cache
Expand All @@ -10,3 +11,4 @@ phpunit.xml
composer.phar
packages.json
results.sarif
infection.log
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ To get the diff between two versions, go to https://github.com/SonsOfPHP/sonsofp
* [PR #133](https://github.com/SonsOfPHP/sonsofphp/pull/133) [Pager] New Contract
* [PR #134](https://github.com/SonsOfPHP/sonsofphp/pull/134) [Pager] New Component
* [PR #170](https://github.com/SonsOfPHP/sonsofphp/pull/170) [Link] New Component (PSR-13)
* [PR #173](https://github.com/SonsOfPHP/sonsofphp/pull/173) [Money] Twig Bridge
* [PR #181](https://github.com/SonsOfPHP/sonsofphp/pull/181) [Cookie] New Component and Contract
* [PR #182](https://github.com/SonsOfPHP/sonsofphp/pull/182) [Container] New Component (PSR-11)
* [PR #187](https://github.com/SonsOfPHP/sonsofphp/pull/187) [HttpHandler] New Component (PSR-15) and Contract
* [PR #190](https://github.com/SonsOfPHP/sonsofphp/pull/190) [Mailer] New Component and Contract

## [0.3.8]

Expand Down
42 changes: 40 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ purge: # Purge vendor and lock files
rm -rf src/SonsOfPHP/Bundle/*/vendor/ src/SonsOfPHP/Bundle/*/composer.lock
rm -rf src/SonsOfPHP/Component/*/vendor/ src/SonsOfPHP/Component/*/composer.lock
rm -rf src/SonsOfPHP/Contract/*/vendor/ src/SonsOfPHP/Contract/*/composer.lock
rm -rf src/tools/*/vendor/ src/tools/*/composer.lock

test: phpunit ## Run PHPUnit Tests

Expand All @@ -52,15 +53,33 @@ test-cache: phpunit
test-clock: PHPUNIT_TESTSUITE=clock
test-clock: phpunit

test-container: PHPUNIT_TESTSUITE=container
test-container: phpunit

test-cookie: PHPUNIT_TESTSUITE=cookie
test-cookie: phpunit

test-cqrs: PHPUNIT_TESTSUITE=cqrs
test-cqrs: phpunit

test-http-factory: PHPUNIT_TESTSUITE=http-factory
test-http-factory: phpunit

test-http-handler: PHPUNIT_TESTSUITE=http-handler
test-http-handler: phpunit

test-link: PHPUNIT_TESTSUITE=link
test-link: phpunit

test-logger: PHPUNIT_TESTSUITE=logger
test-logger: phpunit

test-mailer: PHPUNIT_TESTSUITE=mailer
test-mailer: phpunit

test-money: PHPUNIT_TESTSUITE=money
test-money: phpunit

test-pager: PHPUNIT_TESTSUITE=pager
test-pager: phpunit

Expand Down Expand Up @@ -96,6 +115,12 @@ coverage-cache: coverage
coverage-clock: PHPUNIT_TESTSUITE=clock
coverage-clock: coverage

coverage-container: PHPUNIT_TESTSUITE=container
coverage-container: coverage

coverage-cookie: PHPUNIT_TESTSUITE=cookie
coverage-cookie: coverage

coverage-cqrs: PHPUNIT_TESTSUITE=cqrs
coverage-cqrs: coverage

Expand All @@ -114,6 +139,9 @@ coverage-filesystem:
coverage-http-factory:
XDEBUG_MODE=coverage $(PHP) -dxdebug.mode=coverage $(PHPUNIT) --testsuite http-factory --coverage-html $(COVERAGE_DIR)

coverage-http-handler: PHPUNIT_TESTSUITE=http-handler
coverage-http-handler: coverage

coverage-http-message:
XDEBUG_MODE=coverage $(PHP) -dxdebug.mode=coverage $(PHPUNIT) --testsuite http-message --coverage-html $(COVERAGE_DIR)

Expand All @@ -126,8 +154,11 @@ coverage-link: coverage
coverage-logger: PHPUNIT_TESTSUITE=logger
coverage-logger: coverage

coverage-money:
XDEBUG_MODE=coverage $(PHP) -dxdebug.mode=coverage $(PHPUNIT) --testsuite money --coverage-html $(COVERAGE_DIR)
coverage-mailer: PHPUNIT_TESTSUITE=mailer
coverage-mailer: coverage

coverage-money: PHPUNIT_TESTSUITE=money
coverage-money: coverage

coverage-pager: PHPUNIT_TESTSUITE=pager
coverage-pager: coverage
Expand Down Expand Up @@ -162,6 +193,13 @@ php-cs-fixer-upgrade:
testdox: ## Run tests and output testdox
XDEBUG_MODE=off $(PHP) -dxdebug.mode=off $(PHPUNIT) --testdox

infection:
XDEBUG_MODE=develop \
$(PHP) \
-dxdebug.mode=develop \
-dapc.enable_cli=1 \
tools/infection/vendor/bin/infection --debug -vvv --show-mutations

tools-install: psalm-install php-cs-fixer-install phpunit-install

tools-upgrade: psalm-upgrade php-cs-fixer-upgrade phpunit-upgrade
Expand Down
44 changes: 44 additions & 0 deletions bard.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@
"path": "src/SonsOfPHP/Bard",
"repository": "git@github.com:SonsOfPHP/bard.git"
},
{
"path": "src/SonsOfPHP/Contract/Mailer",
"repository": "git@github.com:SonsOfPHP/mailer-contract.git"
},
{
"path": "src/SonsOfPHP/Component/Mailer",
"repository": "git@github.com:SonsOfPHP/mailer.git"
},
{
"path": "src/SonsOfPHP/Component/Cache",
"repository": "git@github.com:SonsOfPHP/cache.git"
Expand All @@ -13,6 +21,14 @@
"path": "src/SonsOfPHP/Component/Clock",
"repository": "git@github.com:SonsOfPHP/clock.git"
},
{
"path": "src/SonsOfPHP/Component/Container",
"repository": "git@github.com:SonsOfPHP/container.git"
},
{
"path": "src/SonsOfPHP/Component/Cookie",
"repository": "git@github.com:SonsOfPHP/cookie.git"
},
{
"path": "src/SonsOfPHP/Component/Cqrs",
"repository": "git@github.com:SonsOfPHP/cqrs.git"
Expand All @@ -29,6 +45,10 @@
"path": "src/SonsOfPHP/Bridge/Symfony/EventSourcing",
"repository": "git@github.com:SonsOfPHP/event-sourcing-symfony.git"
},
{
"path": "src/SonsOfPHP/Bridge/Twig/Money",
"repository": "git@github.com:SonsOfPHP/money-twig.git"
},
{
"path": "src/SonsOfPHP/Component/EventDispatcher",
"repository": "git@github.com:SonsOfPHP/event-dispatcher.git"
Expand All @@ -53,6 +73,14 @@
"path": "src/SonsOfPHP/Component/HttpFactory",
"repository": "git@github.com:SonsOfPHP/http-factory.git"
},
{
"path": "src/SonsOfPHP/Component/HttpHandler",
"repository": "git@github.com:SonsOfPHP/http-handler.git"
},
{
"path": "src/SonsOfPHP/Contract/HttpHandler",
"repository": "git@github.com:SonsOfPHP/http-handler-contract.git"
},
{
"path": "src/SonsOfPHP/Component/HttpMessage",
"repository": "git@github.com:SonsOfPHP/http-message.git"
Expand All @@ -77,6 +105,18 @@
"path": "src/SonsOfPHP/Component/Pager",
"repository": "git@github.com:SonsOfPHP/pager.git"
},
{
"path": "src/SonsOfPHP/Bridge/Doctrine/Collections/Pager",
"repository": "git@github.com:SonsOfPHP/pager-doctrine-collections.git"
},
{
"path": "src/SonsOfPHP/Bridge/Doctrine/DBAL/Pager",
"repository": "git@github.com:SonsOfPHP/pager-doctrine-dbal.git"
},
{
"path": "src/SonsOfPHP/Bridge/Doctrine/ORM/Pager",
"repository": "git@github.com:SonsOfPHP/pager-doctrine-orm.git"
},
{
"path": "src/SonsOfPHP/Component/Version",
"repository": "git@github.com:SonsOfPHP/version.git"
Expand All @@ -85,6 +125,10 @@
"path": "src/SonsOfPHP/Contract/Common",
"repository": "git@github.com:SonsOfPHP/common-contract.git"
},
{
"path": "src/SonsOfPHP/Contract/Cookie",
"repository": "git@github.com:SonsOfPHP/cookie-contract.git"
},
{
"path": "src/SonsOfPHP/Contract/Cqrs",
"repository": "git@github.com:SonsOfPHP/cqrs-contract.git"
Expand Down
51 changes: 47 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,13 @@
"psr/log-implementation": "^1.0 || ^2.0 || ^3.0",
"sonsofphp/logger-implementation": "0.3.x-dev",
"sonsofphp/pager-implementation": "0.3.x-dev",
"psr/link-implementation": "^1.0 || ^2.0"
"psr/link-implementation": "^1.0 || ^2.0",
"sonsofphp/cookie-implementation": "0.3.x-dev",
"psr/container-implementation": "^1.0 || ^2.0",
"psr/http-server-handler-implementation": "^1.0",
"psr/http-server-middleware-implementation": "^1.0",
"sonsofphp/http-handler-implementation": "0.3.x-dev",
"sonsofphp/mailer-implementation": "0.3.x-dev"
},
"require": {
"php": ">=8.1",
Expand All @@ -70,7 +76,14 @@
"psr/cache": "^2.0 || ^3.0",
"psr/simple-cache": "^3.0",
"psr/log": "^1.0 || ^2.0 || ^3.0",
"psr/link": "^1.0 || ^2.0"
"psr/link": "^1.0 || ^2.0",
"twig/twig": "^3.0",
"ext-intl": "*",
"doctrine/collections": "^2",
"doctrine/orm": "^2",
"psr/container": "^1.0 || ^2.0",
"psr/http-server-handler": "^1.0",
"psr/http-server-middleware": "^1.0"
},
"replace": {
"sonsofphp/bard": "self.version",
Expand Down Expand Up @@ -102,31 +115,53 @@
"sonsofphp/logger-contract": "self.version",
"sonsofphp/pager-contract": "self.version",
"sonsofphp/pager": "self.version",
"sonsofphp/link": "self.version"
"sonsofphp/link": "self.version",
"sonsofphp/money-twig": "self.version",
"sonsofphp/pager-doctrine-collections": "self.version",
"sonsofphp/pager-doctrine-dbal": "self.version",
"sonsofphp/pager-doctrine-orm": "self.version",
"sonsofphp/cookie": "self.version",
"sonsofphp/cookie-contract": "self.version",
"sonsofphp/container": "self.version",
"sonsofphp/http-handler": "self.version",
"sonsofphp/http-handler-contract": "self.version",
"sonsofphp/mailer-contract": "self.version",
"sonsofphp/mailer": "self.version"
},
"autoload": {
"psr-4": {
"SonsOfPHP\\Bard\\": "src/SonsOfPHP/Bard/src",
"SonsOfPHP\\Contract\\Mailer\\": "src/SonsOfPHP/Contract/Mailer",
"SonsOfPHP\\Component\\Mailer\\": "src/SonsOfPHP/Component/Mailer",
"SonsOfPHP\\Component\\Cache\\": "src/SonsOfPHP/Component/Cache",
"SonsOfPHP\\Component\\Clock\\": "src/SonsOfPHP/Component/Clock",
"SonsOfPHP\\Component\\Container\\": "src/SonsOfPHP/Component/Container",
"SonsOfPHP\\Component\\Cookie\\": "src/SonsOfPHP/Component/Cookie",
"SonsOfPHP\\Component\\Cqrs\\": "src/SonsOfPHP/Component/Cqrs",
"SonsOfPHP\\Bundle\\Cqrs\\": "src/SonsOfPHP/Bundle/Cqrs",
"SonsOfPHP\\Bridge\\Symfony\\Cqrs\\": "src/SonsOfPHP/Bridge/Symfony/Cqrs",
"SonsOfPHP\\Bridge\\Symfony\\EventSourcing\\": "src/SonsOfPHP/Bridge/Symfony/EventSourcing",
"SonsOfPHP\\Bridge\\Twig\\Money\\": "src/SonsOfPHP/Bridge/Twig/Money",
"SonsOfPHP\\Component\\EventDispatcher\\": "src/SonsOfPHP/Component/EventDispatcher",
"SonsOfPHP\\Component\\EventSourcing\\": "src/SonsOfPHP/Component/EventSourcing",
"SonsOfPHP\\Bridge\\Doctrine\\EventSourcing\\": "src/SonsOfPHP/Bridge/Doctrine/EventSourcing",
"SonsOfPHP\\Component\\FeatureToggle\\": "src/SonsOfPHP/Component/FeatureToggle",
"SonsOfPHP\\Component\\Filesystem\\": "src/SonsOfPHP/Component/Filesystem",
"SonsOfPHP\\Component\\HttpFactory\\": "src/SonsOfPHP/Component/HttpFactory",
"SonsOfPHP\\Component\\HttpHandler\\": "src/SonsOfPHP/Component/HttpHandler",
"SonsOfPHP\\Contract\\HttpHandler\\": "src/SonsOfPHP/Contract/HttpHandler",
"SonsOfPHP\\Component\\HttpMessage\\": "src/SonsOfPHP/Component/HttpMessage",
"SonsOfPHP\\Component\\Json\\": "src/SonsOfPHP/Component/Json",
"SonsOfPHP\\Component\\Link\\": "src/SonsOfPHP/Component/Link",
"SonsOfPHP\\Component\\Logger\\": "src/SonsOfPHP/Component/Logger",
"SonsOfPHP\\Component\\Money\\": "src/SonsOfPHP/Component/Money",
"SonsOfPHP\\Component\\Pager\\": "src/SonsOfPHP/Component/Pager",
"SonsOfPHP\\Bridge\\Doctrine\\Collections\\Pager\\": "src/SonsOfPHP/Bridge/Doctrine/Collections/Pager",
"SonsOfPHP\\Bridge\\Doctrine\\DBAL\\Pager\\": "src/SonsOfPHP/Bridge/Doctrine/DBAL/Pager",
"SonsOfPHP\\Bridge\\Doctrine\\ORM\\Pager\\": "src/SonsOfPHP/Bridge/Doctrine/ORM/Pager",
"SonsOfPHP\\Component\\Version\\": "src/SonsOfPHP/Component/Version",
"SonsOfPHP\\Contract\\Common\\": "src/SonsOfPHP/Contract/Common",
"SonsOfPHP\\Contract\\Cookie\\": "src/SonsOfPHP/Contract/Cookie",
"SonsOfPHP\\Contract\\Cqrs\\": "src/SonsOfPHP/Contract/Cqrs",
"SonsOfPHP\\Contract\\EventSourcing\\": "src/SonsOfPHP/Contract/EventSourcing",
"SonsOfPHP\\Contract\\FeatureToggle\\": "src/SonsOfPHP/Contract/FeatureToggle",
Expand All @@ -138,24 +173,32 @@
},
"exclude-from-classmap": [
"src/SonsOfPHP/Bard/Tests",
"src/SonsOfPHP/Component/Mailer/Tests",
"src/SonsOfPHP/Component/Cache/Tests",
"src/SonsOfPHP/Component/Clock/Tests",
"src/SonsOfPHP/Component/Container/Tests",
"src/SonsOfPHP/Component/Cookie/Tests",
"src/SonsOfPHP/Component/Cqrs/Tests",
"src/SonsOfPHP/Bundle/Cqrs/Tests",
"src/SonsOfPHP/Bridge/Symfony/Cqrs/Tests",
"src/SonsOfPHP/Bridge/Symfony/EventSourcing/Tests",
"src/SonsOfPHP/Bridge/Twig/Money/Tests",
"src/SonsOfPHP/Component/EventDispatcher/Tests",
"src/SonsOfPHP/Component/EventSourcing/Tests",
"src/SonsOfPHP/Bridge/Doctrine/EventSourcing/Tests",
"src/SonsOfPHP/Component/FeatureToggle/Tests",
"src/SonsOfPHP/Component/Filesystem/Tests",
"src/SonsOfPHP/Component/HttpFactory/Tests",
"src/SonsOfPHP/Component/HttpHandler/Tests",
"src/SonsOfPHP/Component/HttpMessage/Tests",
"src/SonsOfPHP/Component/Json/Tests",
"src/SonsOfPHP/Component/Link/Tests",
"src/SonsOfPHP/Component/Logger/Tests",
"src/SonsOfPHP/Component/Money/Tests",
"src/SonsOfPHP/Component/Pager/Tests",
"src/SonsOfPHP/Bridge/Doctrine/Collections/Pager/Tests",
"src/SonsOfPHP/Bridge/Doctrine/DBAL/Pager/Tests",
"src/SonsOfPHP/Bridge/Doctrine/ORM/Pager/Tests",
"src/SonsOfPHP/Component/Version/Tests"
]
},
Expand All @@ -181,4 +224,4 @@
"SonsOfPHP\\Bridge\\Symfony\\Cqrs\\Tests\\": "src/SonsOfPHP/Bridge/Symfony/Cqrs/Tests"
}
}
}
}
Loading

0 comments on commit 19f8198

Please sign in to comment.