Merge pull request #47 from coenjacobs/config-value-object

Config value object instead of manually reading the file

Dockerfile

@@ -1,14 +1,20 @@
 FROM composer:2.7.7
 FROM php:8.3.9-cli-alpine AS base
 
-FROM base as builder
+FROM base AS builder
 RUN apk update && apk add git
+RUN apk add --update linux-headers
+RUN apk add --no-cache $PHPIZE_DEPS \
+ && pecl install xdebug-3.3.2 \
+ && docker-php-ext-enable xdebug
+COPY ./docker/php/xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+COPY ./docker/php/error_reporting.ini /usr/local/etc/php/conf.d/error_reporting.ini
 COPY --from=composer /usr/bin/composer /usr/bin/composer
 COPY ./ /mozart/
 WORKDIR /mozart/
 RUN composer install
 
-FROM builder as packager
+FROM builder AS packager
 RUN rm -rf vendor
 RUN composer install --no-dev -o
 

composer.json

@@ -12,7 +12,8 @@
  "prefer-stable": true,
  "license": "MIT",
  "require": {
- "php": "^8.0"
+ "php": "^8.0",
+ "netresearch/jsonmapper": "^4.4"
  },
  "autoload": {
  "psr-4": {

docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3.4'
 services:
  builder:
  build:

docker/php/error_reporting.ini

@@ -0,0 +1 @@
+error_reporting=E_ALL

docker/php/xdebug.ini

@@ -0,0 +1,6 @@
+zend_extension=xdebug
+
+[xdebug]
+xdebug.mode=develop,debug
+xdebug.client_host=host.docker.internal
+xdebug.start_with_request=yes

phpcs.xml.dist

@@ -5,7 +5,7 @@
  <rule ref="PSR2"/>
 
  <rule ref="PHPCompatibility"/>
- <config name="testVersion" value="8.0-"/>
+ <config name="testVersion" value="8.0-8.3"/>
 
  <file>./src</file>
 </ruleset>

src/Composer/Autoload/Autoloader.php

@@ -4,6 +4,9 @@
 
 interface Autoloader
 {
- public function processConfig($autoloadConfig);
- public function getSearchNamespace();
+ /**
+ * @param mixed $autoloadConfig
+ */
+ public function processConfig($autoloadConfig): void;
+ public function getSearchNamespace(): string;
 }

src/Composer/Autoload/NamespaceAutoloader.php

@@ -12,37 +12,37 @@ abstract class NamespaceAutoloader implements Autoloader
  *
  * e.g. src/
  *
- * @var string[]
+ * @var array<string>
  */
  public $paths = [];
 
  /**
  * A package's composer.json config autoload key's value, where $key is `psr-1`|`psr-4`|`classmap`.
  *
  * @param $autoloadConfig
- *
- * @return void
  */
- public function processConfig($autoloadConfig)
+ public function processConfig($autoloadConfig): void
  {
- foreach ($autoloadConfig as $key => $value) {
- $this->namespace = $key;
- array_push($this->paths, $value);
+ if (is_array($autoloadConfig)) {
+ foreach ($autoloadConfig as $path) {
+ array_push($this->paths, $path);
+ }
+ } else {
+ array_push($this->paths, $autoloadConfig);
  }
  }
 
- /**
- * @return string
- */
- public function getSearchNamespace()
+ public function getNamespace(): string
  {
- return $this->namespace;
+ return rtrim($this->namespace, '\\') . '\\';
  }
 
- /**
- * @return string
- */
- public function getNamespacePath()
+ public function getSearchNamespace(): string
+ {
+ return rtrim($this->namespace, '\\');
+ }
+
+ public function getNamespacePath(): string
  {
  return '';
  }

src/Config/Autoload.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace CoenJacobs\Mozart\Config;
+
+use CoenJacobs\Mozart\Composer\Autoload\Autoloader;
+use stdClass;
+
+class Autoload
+{
+ /** @var array<Autoloader> */
+ public array $autoloaders = [];
+
+ public function setupAutoloaders(stdClass $autoloadData): void
+ {
+ $autoloaders = [];
+
+ if (isset($autoloadData->{'psr-4'})) {
+ $psr4Autoloaders = (array) $autoloadData->{'psr-4'};
+ foreach ($psr4Autoloaders as $key => $value) {
+ $autoloader = new Psr4();
+ $autoloader->namespace = $key;
+ $autoloader->processConfig($value);
+ $autoloaders[] = $autoloader;
+ }
+ }
+
+ if (isset($autoloadData->{'psr-0'})) {
+ $psr0Autoloaders = (array) $autoloadData->{'psr-0'};
+ foreach ($psr0Autoloaders as $key => $value) {
+ $autoloader = new Psr0();
+ $autoloader->namespace = $key;
+ $autoloader->processConfig($value);
+ $autoloaders[] = $autoloader;
+ }
+ }
+
+ if (isset($autoloadData->classmap)) {
+ $autoloader = new Classmap();
+ $autoloader->processConfig($autoloadData->classmap);
+ $autoloaders[] = $autoloader;
+ }
+
+ $this->setAutoloaders($autoloaders);
+ }
+
+ /**
+ * @param array<Autoloader> $autoloaders
+ */
+ public function setAutoloaders(array $autoloaders): void
+ {
+ foreach ($autoloaders as $autoloader) {
+ if (! $autoloader instanceof Autoloader) {
+ continue;
+ }
+
+ array_push($this->autoloaders, $autoloader);
+ }
+ }
+
+ /**
+ * @return Autoloader[]
+ */
+ public function getAutoloaders(): array
+ {
+ return $this->autoloaders;
+ }
+}

src/Config/Classmap.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace CoenJacobs\Mozart\Config;
+
+use CoenJacobs\Mozart\Composer\Autoload\Autoloader;
+use Exception;
+
+class Classmap implements Autoloader
+{
+ /** @var string[] */
+ public $files = [];
+
+ /** @var string[] */
+ public $paths = [];
+
+ /**
+ * @inheritdoc
+ */
+ public function processConfig($autoloadConfig): void
+ {
+ foreach ($autoloadConfig as $value) {
+ if ('.php' == substr($value, -4, 4)) {
+ array_push($this->files, $value);
+ } else {
+ array_push($this->paths, $value);
+ }
+ }
+ }
+
+ /**
+ * @throws Exception
+ */
+ public function getSearchNamespace(): string
+ {
+ throw new Exception('Classmap autoloaders do not contain a namespace and this method can not be used.');
+ }
+}

src/Config/Extra.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace CoenJacobs\Mozart\Config;
+
+class Extra
+{
+ public ?Mozart $mozart = null;
+
+ public function getMozart(): ?Mozart
+ {
+ return $this->mozart;
+ }
+}