Merge pull request #9 from factorio-item-browser/project-phoenix

Author: BluePsyduck

.gitignore

@@ -1,5 +1,5 @@
 /.idea
-/test/log
+/test/coverage
 /vendor
 
 /.phpunit.result.cache

.travis.yml

@@ -3,8 +3,8 @@ language: php
 matrix:
   fast_finish: true
   include:
-    - php: '7.2'
     - php: '7.3'
+    - php: '7.4'
 
 cache:
   directories:
@@ -15,8 +15,8 @@ install:
 
 script:
   - vendor/bin/phpunit --testsuite=unit-test --coverage-clover=coverage.xml
-  - vendor/bin/phpunit --testsuite=serializer-test
   - vendor/bin/coverage-check coverage.xml 100
+  - vendor/bin/phpunit --testsuite=serializer-test
   - vendor/bin/phpcs -np --colors
   - vendor/bin/phpstan analyse --no-interaction
 

CHANGELOG.md

@@ -1,11 +1,14 @@
-.PHONY: help bash test update
+.PHONY: help bash fix test update
 
 help: ## Show this help.
 	@fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' | sed -e 's/##//'
 
 bash: ## Run the docker container and connect to it using bash.
 	docker run -it --rm -v $(shell pwd):/project bluepsyduck/php-fpm bash
 
+fix: ## Fixes the codestyle in the project.
+	docker run -it --rm -v $(shell pwd):/project bluepsyduck/php-fpm composer phpcbf
+
 test: ## Test the project.
 	docker run -it --rm -v $(shell pwd):/project bluepsyduck/php-fpm composer test
 

Makefile

@@ -12,21 +12,21 @@
     }
   ],
   "require": {
-    "php": "^7.2",
+    "php": "^7.3",
     "factorio-item-browser/common": "^1.0",
     "guzzlehttp/guzzle": "^6.3",
-    "jms/serializer": "^2.1",
-    "symfony/yaml": "^4.2",
-    "zendframework/zend-servicemanager": "^3.0"
+    "jms/serializer": "^3.2",
+    "laminas/laminas-servicemanager": "^3.0",
+    "symfony/yaml": "^4.2"
   },
   "require-dev": {
     "ext-json": "*",
     "bluepsyduck/test-helper": "^1.0",
-    "phpstan/phpstan": "^0.11",
-    "phpstan/phpstan-phpunit": "^0.11",
-    "phpstan/phpstan-strict-rules": "^0.11",
+    "phpstan/phpstan": "^0.12",
+    "phpstan/phpstan-phpunit": "^0.12",
+    "phpstan/phpstan-strict-rules": "^0.12",
     "phpunit/phpunit": "^8.0",
-    "rregeer/phpunit-coverage-check": "^0.1",
+    "rregeer/phpunit-coverage-check": "^0.3",
     "squizlabs/php_codesniffer": "^3.3"
   },
   "autoload": {
@@ -37,26 +37,20 @@
   "autoload-dev": {
     "psr-4": {
       "FactorioItemBrowserTest\\Api\\Client\\": "test/src/",
-      "FactorioItemBrowserTestAsset\\Api\\Client\\": "test/asset/",
       "FactorioItemBrowserTestSerializer\\Api\\Client\\": "test/serializer/"
     }
   },
-  "extra": {
-    "zf": {
-      "config-provider": "FactorioItemBrowser\\Api\\Client\\ConfigProvider"
-    }
-  },
   "scripts": {
-    "coverage-check": "coverage-check test/log/clover.xml 100",
+    "coverage-check": "coverage-check test/coverage/clover.xml 100",
     "phpcbf": "phpcbf -p --colors",
     "phpcs": "phpcs -p --colors",
     "phpstan": "phpstan analyse --no-interaction --ansi",
     "test-unit": "phpunit --testsuite unit-test --colors=always --coverage-html=test/coverage --coverage-clover=test/coverage/clover.xml",
     "test-serialize": "phpunit --testsuite serializer-test --colors=always",
     "test": [
       "@test-unit",
-      "@test-serialize",
       "@coverage-check",
+      "@test-serialize",
       "@phpcs",
       "@phpstan"
     ]

README.md

@@ -18,13 +18,14 @@
         ConfigKey::API_CLIENT => [
             ConfigKey::ENDPOINTS => [
                 Endpoint\Auth\AuthEndpoint::class,
+                Endpoint\Combination\CombinationExportEndpoint::class,
+                Endpoint\Combination\CombinationStatusEndpoint::class,
                 Endpoint\Generic\GenericDetailsEndpoint::class,
                 Endpoint\Generic\GenericIconEndpoint::class,
                 Endpoint\Item\ItemIngredientEndpoint::class,
                 Endpoint\Item\ItemProductEndpoint::class,
                 Endpoint\Item\ItemRandomEndpoint::class,
                 Endpoint\Mod\ModListEndpoint::class,
-                Endpoint\Mod\ModMetaEndpoint::class,
                 Endpoint\Recipe\RecipeDetailsEndpoint::class,
                 Endpoint\Recipe\RecipeMachinesEndpoint::class,
                 Endpoint\Search\SearchQueryEndpoint::class,

composer.json

@@ -12,7 +12,7 @@
 namespace FactorioItemBrowser\Api\Client;
 
 use FactorioItemBrowser\Api\Client\Constant\ServiceName;
-use Zend\ServiceManager\Factory\InvokableFactory;
+use Laminas\ServiceManager\Factory\InvokableFactory;
 
 return [
     'dependencies' => [
@@ -22,13 +22,14 @@
             Client\Options::class => Client\OptionsFactory::class,
 
             Endpoint\Auth\AuthEndpoint::class => InvokableFactory::class,
+            Endpoint\Combination\CombinationExportEndpoint::class => InvokableFactory::class,
+            Endpoint\Combination\CombinationStatusEndpoint::class => InvokableFactory::class,
             Endpoint\Generic\GenericDetailsEndpoint::class => InvokableFactory::class,
             Endpoint\Generic\GenericIconEndpoint::class => InvokableFactory::class,
             Endpoint\Item\ItemIngredientEndpoint::class => InvokableFactory::class,
             Endpoint\Item\ItemProductEndpoint::class => InvokableFactory::class,
             Endpoint\Item\ItemRandomEndpoint::class => InvokableFactory::class,
             Endpoint\Mod\ModListEndpoint::class => InvokableFactory::class,
-            Endpoint\Mod\ModMetaEndpoint::class => InvokableFactory::class,
             Endpoint\Recipe\RecipeDetailsEndpoint::class => InvokableFactory::class,
             Endpoint\Recipe\RecipeMachinesEndpoint::class => InvokableFactory::class,
             Endpoint\Search\SearchQueryEndpoint::class => InvokableFactory::class,