Merge pull request #5 from factorio-item-browser/develop

Version 1.1.0

Author: BluePsyduck

.gitattributes

@@ -5,4 +5,5 @@
 /.gitignore export-ignore
 /.travis.yml export-ignore
 /docker-compose.yml export-ignore
+/phpcs.xml export-ignore
 /phpunit.xml export-ignore

.gitignore

@@ -1,3 +1,3 @@
 /.idea
-/tests/log
+/test/log
 /vendor

.travis.yml

@@ -1,16 +1,21 @@
 language: php
 
-php:
-  - 7.0
-  - 7.1
-  - 7.2
-  - nightly
+matrix:
+  fast_finish: true
+  include:
+    - php: 7.0
+    - php: 7.1
+    - php: 7.2
+    - php: nightly
+  allow_failures:
+    - php: nightly
 
 install:
   - composer update --no-interaction
 
 script:
   - vendor/bin/phpunit --coverage-clover=coverage.xml
+  - vendor/bin/phpcs -np --colors
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)

CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## 1.1.0 - 2018-07-21
+
+### Added
+
+- `Machine` entity.
+- `/recipe/machines` request and response.
+
+### Changed
+
+- Expensive recipes are now returned attached to their normal version instead of a separate recipe. 
+  This changes the responses of `/item/ingredient`, `/item/product`, `/item/random`, `/recipe/details` and 
+  `/search/query` requests. 
+
+### Removed
+
+- `Meta` entity from all responses.
+
 ## 1.0.1 - 2018-04-14
 
 ### Added

composer.json

@@ -17,7 +17,8 @@
     "bluepsyduck/multicurl": "^2.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^6.0"
+    "phpunit/phpunit": "^6.0 || ^7.0",
+    "squizlabs/php_codesniffer": "^3.3"
   },
   "autoload": {
     "psr-4": {
@@ -26,11 +27,17 @@
   },
   "autoload-dev": {
     "psr-4": {
-      "FactorioItemBrowserTest\\Api\\Client\\": "tests/src/",
-      "FactorioItemBrowserTestAsset\\Api\\Client\\": "tests/asset/"
+      "FactorioItemBrowserTest\\Api\\Client\\": "test/src/",
+      "FactorioItemBrowserTestAsset\\Api\\Client\\": "test/asset/"
     }
   },
   "scripts": {
-    "test": "phpunit --colors=always --coverage-html=tests/log"
+    "phpcbf": "phpcbf -p --colors",
+    "phpcs": "phpcs -p --colors",
+    "phpunit": "phpunit --colors=always --coverage-html=test/log",
+    "test": [
+      "@phpunit",
+      "@phpcs"
+    ]
   }
 }