Merge branch '0.x'

Author: itnelo

.dockerignore

@@ -0,0 +1,14 @@
+.idea
+.git
+.gitignore
+.github
+config/parameters.yml
+node_modules
+tests
+vendor
+LICENSE
+*.md
+*.yml
+*.yml.dist
+*.xml
+*.xml.dist

.env.dev.dist

@@ -10,6 +10,10 @@
 
 COMPOSE_PROJECT_NAME=reactphp_foundation
 
+# developer's uid on the host machine
+# id -u
+HOST_UID=1000
+
 TIMEZONE=Europe/Moscow
 SOURCE_PATH=.
 DEPLOYMENT_PATH=/var/www/foundation
@@ -21,9 +25,9 @@ PHP_VERSION=7.4
 APP_ENV=dev
 APP_SERVER_PORT=6636
 # prebuilt image for stack
-# see Dockerfile-stack from the 'docker' directory
-APP_STACK_IMAGE_NAME=
-APP_STACK_IMAGE_VERSION=
+# see Dockerfile-standalone from the 'docker' directory
+APP_STACK_IMAGE_NAME=127.0.0.1:5000/app
+APP_STACK_IMAGE_VERSION=latest
 
 # haproxy
 HAPROXY_VERSION=2.2

.gitignore

@@ -7,3 +7,5 @@ docker-compose.stack.yml
 vendor/
 
 config/parameters.yml
+
+phpunit.xml

CHANGELOG.md

@@ -10,6 +10,31 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - No changes yet.
 
+## [0.3.0] - 2020-08-17
+### Added
+
+- `Uri\MatcherInterface` and `ArrayMatcher` to map URI path from requests
+to the handler's actions (a simplified version of `UrlMatcher` from
+[symfony/routing](https://github.com/symfony/routing/blob/v5.1.0/Matcher/UrlMatcher.php)).
+- `.dockerignore` to exclude unnecessary/insecure files from the image building context.
+- Test suite configuration for [PHPUnit](https://github.com/sebastianbergmann/phpunit).
+- "Tests" block and navigation links for README.md.
+
+### Changed
+
+- Container configuration logic has moved from the application entrypoint
+to the `YamlConfigurator` shortcut.
+- Using HTTP health checks for HAProxy instance (instead of TCP).
+
+### Fixed
+
+- Definition options from `_defaults` node in the `services.yml` are now properly
+picked up by all services, not only ones defined in the same file (works if that node
+doesn't already exists in the target definition file; revised
+`YamlFileLoader` in the `Bridge\Symfony` scope).
+- Explicit UIDs and permissions for users within Dockerfiles
+(preventing potential access issues during CI checks and other workflows).
+
 ## [0.2.0] - 2020-07-20
 ### Added
 
@@ -31,6 +56,7 @@ the async socket server and the event loop.
 - `ServerInterface` and the `HandlerInterface`, example handler implementation.
 - Non-blocking logger (based on [wyrihaximus/react-psr-3-stdio](https://github.com/WyriHaximus/reactphp-psr-3-stdio)).
 
-[Unreleased]: https://github.com/itnelo/reactphp-foundation/compare/0.2.0...0.x
+[Unreleased]: https://github.com/itnelo/reactphp-foundation/compare/0.3.0...0.x
+[0.3.0]: https://github.com/itnelo/reactphp-foundation/compare/0.2.0..0.3.0
 [0.2.0]: https://github.com/itnelo/reactphp-foundation/compare/0.1.0..0.2.0
 [0.1.0]: https://github.com/itnelo/reactphp-foundation/releases/tag/0.1.0

README.md

@@ -1,6 +1,15 @@
 
 # ReactPHP Foundation
 
+- [What's inside?](#whats-inside)
+- [Installation](#installation)
+    - [Docker Swarm](#docker-swarm)
+- [Tests](#tests)
+- [See also](#see-also)
+- [Changelog](#changelog)
+
+## What's inside?
+
 This skeleton for self-sufficient, asynchronous microservice contains:
 
 - Interfaces
@@ -21,11 +30,16 @@ This skeleton for self-sufficient, asynchronous microservice contains:
 It follows strong SOLID design and fully PSR-compatible, built
 with PHP 7.4+ features in mind (starting with typed properties). 
 
-It is also relatively lightweight and takes benefits
+It is also _relatively_ lightweight and takes benefits
 from both [Symfony](https://github.com/symfony/symfony) components
 and [ReactPHP](https://github.com/reactphp/reactphp)
 without raising up a heavy artillery setup.
 
+There are a few deployment configurations
+([Docker Compose](https://docs.docker.com/compose) project and
+stack for [Docker Swarm](https://docs.docker.com/engine/swarm/key-concepts),
+featuring [HAProxy](https://www.haproxy.com) as a load balancer for your code).
+
 ## Installation
 
 ### Docker Swarm
@@ -130,9 +144,21 @@ use your manager node IP) a rendered page with backend statistics should be avai
 To rebalance app replicas between nodes, after one is added or removed, use:
 
 ```
+# our pc
 $ docker service update --force my-service_app
 ```
 
+## Tests
+
+Apply test suite configuration and run [phpunit](https://github.com/sebastianbergmann/phpunit):
+
+```
+$ cp phpunit.xml.dist phpunit.xml
+
+# for docker-compose installation
+$ docker-compose run --rm app bin/phpunit
+```
+
 ## See also
 
 - [driftphp/driftphp](https://github.com/driftphp/driftphp) — 

bin/app

@@ -15,49 +15,35 @@
 declare(strict_types=1);
 
 use Foundation\Application;
+use Foundation\Bridge\Symfony\Component\DependencyInjection\Configurator\YamlConfigurator;
 use Symfony\Component\Config\FileLocator;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
-use Symfony\Component\DependencyInjection\ParameterBag\EnvPlaceholderParameterBag;
-use Symfony\Component\Dotenv\Dotenv;
-use Symfony\Component\Yaml\Yaml;
 
 require_once __DIR__ . '/../vendor/autoload.php';
 
-$envFilePath = __DIR__ . '/../.env';
+$parameterFilePath = __DIR__ . '/../config/parameters.yml';
 
-// will populate env variables from env-type files (only if they're not already set).
-if (file_exists($envFilePath)) {
-    (new Dotenv())->loadEnv($envFilePath);
-}
-
-$configFilePath = __DIR__ . '/../config/parameters.yml';
-
-if (!file_exists($configFilePath)) {
+if (!file_exists($parameterFilePath)) {
     throw new RuntimeException("File 'parameters.yml' is missing. Please, put it into the 'config' directory.");
 }
 
-$config       = Yaml::parseFile($configFilePath);
-$parameterBag = new EnvPlaceholderParameterBag($config['parameters']);
-
-$container = new ContainerBuilder($parameterBag);
-
-// loading service definitions.
-$definitionLoader    = new YamlFileLoader($container, new FileLocator());
-$definitionFilePaths = [
-    __DIR__ . '/../config/services/request_handlers.yml',
-    __DIR__ . '/../config/services/loggers.yml',
-    __DIR__ . '/../config/services/shutdown.yml',
-    __DIR__ . '/../config/services/async/streams.yml',
-    __DIR__ . '/../config/services/async/server.yml',
-    __DIR__ . '/../config/services/async/event_loop.yml',
-    __DIR__ . '/../config/services.yml',
-];
-
-foreach ($definitionFilePaths as $definitionFilePath) {
-    $definitionLoader->load($definitionFilePath);
-}
-
+$containerConfigurator = new YamlConfigurator(new FileLocator());
+$containerConfigurator->setEnvironmentFilePath(__DIR__ . '/../.env');
+$containerConfigurator->setParameterFilePath($parameterFilePath);
+$containerConfigurator->setDefinitionFilePaths(
+    [
+        __DIR__ . '/../config/services.yml',
+        __DIR__ . '/../config/services/loggers.yml',
+        __DIR__ . '/../config/services/async/event_loop.yml',
+        __DIR__ . '/../config/services/async/server.yml',
+        __DIR__ . '/../config/services/async/streams.yml',
+        __DIR__ . '/../config/services/shutdown.yml',
+        __DIR__ . '/../config/services/request/uri_matcher.yml',
+        __DIR__ . '/../config/services/request/handler.yml',
+    ]
+);
+$containerConfigurator->setDefinitionDefaultsFilePath(__DIR__ . '/../config/services.yml');
+
+$container = $containerConfigurator->getContainerBuilder();
 // we are starting an async web server with some concurrent code
 // so we don't need any container caching logic for this case.
 $container->compile(true);

bin/phpunit

@@ -0,0 +1 @@
+../vendor/bin/phpunit

composer.json

@@ -14,12 +14,16 @@
     ],
     "autoload": {
         "psr-4": {
-            "Foundation\\": ["src/"]
+            "Foundation\\": [
+                "src/"
+            ]
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Foundation\\Tests\\": "tests/"
+            "Foundation\\Tests\\": [
+                "tests/unit"
+            ]
         }
     },
     "minimum-stability": "stable",
@@ -38,6 +42,9 @@
         "symfony/yaml": "^5.1",
         "wyrihaximus/react-psr-3-stdio": "^2.1"
     },
+    "require-dev": {
+        "phpunit/phpunit": "^9.2"
+    },
     "config": {
         "sort-packages": true
     },

config/parameters.yml.dist config/parameters.yml.dev.distconfig/parameters.yml.dist renamed to config/parameters.yml.dev.dist

@@ -1,6 +1,7 @@
 
 services:
-    # default configuration for services in *this* file
+    # default configuration will be applied for ALL SERVICES (if not explicitly specified in the target file)
+    # this behavior is a result of Symfony DI logic revision, see YamlFileLoader from the "Bridge\Symfony" scope.
     _defaults:
         # automatically injects dependencies in your services
         autowire: false