Update from internal 0.14 release

Author: alenpokos

.gitlab-ci.yml

@@ -2,8 +2,9 @@ variables:
   COMPOSE_PROJECT_NAME: "jsonapibundle${CI_BUILD_ID}"
 
 stages:
-  - test
+  - test-latest
   - lint
+  - test-versions
 
 after_script:
   - cd tests/Resources/docker/
@@ -12,8 +13,9 @@ after_script:
   - docker-compose down
   - echo "All Done!"
 
-ci:
-  stage: test
+# any latest built
+ci-latest:
+  stage: test-latest
   tags:
       - docker-compose
   script:
@@ -23,6 +25,96 @@ ci:
     - docker-compose run --no-deps --rm php php vendor/bin/phpunit --debug --colors=never --coverage-text=php://stdout --coverage-html=logs/coverage
     - bin/php php ../../../vendor/bin/security-checker security:check ../../../composer.lock
 
+# symfony 4.1 build
+ci-symfony4.1:
+  stage: test-versions
+  tags:
+      - docker-compose
+  script:
+    - cd tests/Resources/docker/
+    - docker-compose build
+    - docker-compose up -d
+    - bin/composer require "symfony/framework-bundle:^4.1" "symfony/form:^4.1" "symfony/validator:^4.1" --no-interaction --no-ansi --prefer-dist
+    - docker-compose run --no-deps --rm php composer install --no-interaction --no-ansi --prefer-dist
+    - bin/setup_fixtures.sh
+    - docker-compose run --no-deps --rm php php vendor/bin/phpunit --debug --colors=never
+
+# supported 4.0 build
+ci-symfony4.0:
+  stage: test-versions
+  tags:
+      - docker-compose
+  script:
+    - cd tests/Resources/docker/
+    - docker-compose build
+    - docker-compose up -d
+    - bin/composer require "symfony/framework-bundle:^4.0" "symfony/form:^4.0" "symfony/validator:^4.0" --no-interaction --no-ansi --prefer-dist
+    - docker-compose run --no-deps --rm php composer install --no-interaction --no-ansi --prefer-dist
+    - bin/setup_fixtures.sh
+    - docker-compose run --no-deps --rm php php vendor/bin/phpunit --debug --colors=never
+
+# supported 3.4 build
+ci-symfony3.4:
+  stage: test-versions
+  tags:
+      - docker-compose
+  script:
+    - cd tests/Resources/docker/
+    - docker-compose build
+    - docker-compose up -d
+    - mv -f ../app/config/symfony34/config.yml ../app/config/
+    - bin/composer require "symfony/framework-bundle:^3.4" "symfony/form:^3.4" "symfony/validator:^3.4" --no-interaction --no-ansi --prefer-dist
+    - docker-compose run --no-deps --rm php composer install --no-interaction --no-ansi --prefer-dist
+    - bin/setup_fixtures.sh
+    - docker-compose run --no-deps --rm php php vendor/bin/phpunit --debug --colors=never
+
+# un-supported 3.3 build
+ci-symfony3.3:
+  stage: test-versions
+  tags:
+      - docker-compose
+  script:
+    - cd tests/Resources/docker/
+    - docker-compose build
+    - docker-compose up -d
+    - mv -f ../app/config/symfony34/config.yml ../app/config/
+    - bin/composer require "symfony/framework-bundle:^3.3" "symfony/form:^3.3" "symfony/validator:^3.3" --no-interaction --no-ansi --prefer-dist
+    - docker-compose run --no-deps --rm php composer install --no-interaction --no-ansi --prefer-dist
+    - bin/setup_fixtures.sh
+    - docker-compose run --no-deps --rm php php vendor/bin/phpunit --debug --colors=never
+
+
+# un-supported 3.2 build
+ci-symfony3.2:
+  stage: test-versions
+  tags:
+      - docker-compose
+  script:
+    - cd tests/Resources/docker/
+    - docker-compose build
+    - docker-compose up -d
+    - mv -f ../app/config/symfony34/config.yml ../app/config/
+    - bin/composer require "symfony/framework-bundle:^3.2" "symfony/form:^3.2" "symfony/validator:^3.2" --no-interaction --no-ansi --prefer-dist
+    - docker-compose run --no-deps --rm php composer install --no-interaction --no-ansi --prefer-dist
+    - bin/setup_fixtures.sh
+    - docker-compose run --no-deps --rm php php vendor/bin/phpunit --debug --colors=never
+
+
+# supported 3.1 build
+ci-symfony3.1:
+  stage: test-versions
+  tags:
+      - docker-compose
+  script:
+    - cd tests/Resources/docker/
+    - docker-compose build
+    - docker-compose up -d
+    - mv -f ../app/config/symfony34/config.yml ../app/config/
+    - bin/composer require "symfony/framework-bundle:^3.1" "symfony/form:^3.1" "symfony/validator:^3.1" --no-interaction --no-ansi --prefer-dist
+    - docker-compose run --no-deps --rm php composer install --no-interaction --no-ansi --prefer-dist
+    - bin/setup_fixtures.sh
+    - docker-compose run --no-deps --rm php php vendor/bin/phpunit --debug --colors=never
+
 lint:
   stage: lint
   tags:

.php_cs.dist

@@ -8,6 +8,7 @@ $finder = PhpCsFixer\Finder::create()
         __DIR__ . '/src',
         __DIR__ . '/tests',
     ])
+    ->exclude('cache')
 ;
 
 return PhpCsFixer\Config::create()
@@ -37,6 +38,7 @@ return PhpCsFixer\Config::create()
         'yoda_style'                 => true,
         'compact_nullable_typehint'  => true,
         'visibility_required' => true,
+        'no_superfluous_phpdoc_tags' => true,
     ])
     ->setRiskyAllowed(true)
     ->setFinder($finder)

CHANGELOG.md

@@ -4,9 +4,30 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## Unreleased
 
+## [0.14.0] 2018-10-23
 
+### Added
+- Added support for automatically mapped schema files, see [schema automapping docs](src/Resources/doc/getting_started/schema_automapping.md)
+- Implemented support for required roles config directive, see [config reference](src/Resources/doc/configuration/configuration.md)
+
+### Changed
+- `\Trikoder\JsonApiBundle\Controller\AbstractController` is now auto-tagged with the `controller.service_arguments` tag.
+
+
+## [0.11.0] 2018-08-03
+
+### Changed
+- Changed route annotation use to symfony/routing, previously was sensio/framework-extra-bundle
+- Added symfony/routing as dependancy on 3.4
+- Added "doctrine/common": "<2.9" as dependancy to cover deprication notices
+
+### Removed
+- Removed second argument (ServiceContainer) of schema as closure definition. see [Manual](src/Resources/doc/getting_started/schema_class_map.md)
+
+### Deprecated
+- Deprecated RepositoryFactoryInterface (`\Trikoder\JsonApiBundle\Repository\RepositoryFactoryInterface`) in favour of using DIC factory options
 
 ## [0.1.0] 2017-07-27
 

README.md

@@ -90,6 +90,8 @@ Copyright (C) 2017 Trikoder
 
 Author: Alen Pokos.
 
+Contributors (in alphabetic order): Antonio Pauletich, Alen Pokos, Antonio Šunjić, Damir Trputec, Juraj Juričić, Krešo Kunjas, Petar Obradović, Vedran Krizek, Vedran Mihočinec
+
 ## License
 
 Package is licensed under [MIT License](./LICENSE)

composer.json

@@ -4,34 +4,35 @@
   "type": "symfony-bundle",
   "require": {
     "php": ">=7.0.0|>=7.1.0",
-    "symfony/framework-bundle": "^3.1|^4.0",
-    "symfony/dependency-injection": "^3.1|^4.0",
+    "symfony/framework-bundle": ">=3.1 <5.0",
+    "symfony/dependency-injection": ">=3.1 <5.0",
+    "sensio/framework-extra-bundle": ">3.0|^5.1|^5.2",
+    "symfony/form": ">=3.1 <5.0",
+    "symfony/routing": ">=3.1 <5.0",
+    "symfony/security-bundle": "^3.1|^4.0",
+    "symfony/translation": ">=3.1 <5.0",
+    "symfony/validator": ">=3.1 <5.0",
+    "symfony/monolog-bundle": ">=3.1 <5.0",
     "neomerx/json-api": "^1.0",
-    "doctrine/orm": "~2.4,<2.5|2.5|^2.6",
-    "doctrine/doctrine-bundle": "~1.6|^1.8",
-    "sensio/framework-extra-bundle": "^3.0|^5.1",
-    "symfony/form": "^3.1|^4.0",
-    "symfony/translation": "^3.3|^4.0",
-    "symfony/validator": "^3.3|^4.0",
-    "symfony/monolog-bundle": "^3.1"
+    "doctrine/orm": "^2.4",
+    "doctrine/common": "^2",
+    "doctrine/doctrine-bundle": "~1.6|^1.8|^1.9"
   },
   "require-dev": {
-    "sensio/generator-bundle": "3.0.*|3.1.*|3.2.*|3.3.*",
     "phpunit/phpunit": "^5.7",
     "phpunit/php-code-coverage": "^4.0",
     "symfony/phpunit-bridge": "^3.0|^4.0",
     "justinrainbow/json-schema": "^1.6",
     "doctrine/doctrine-fixtures-bundle": "^2.3",
     "fzaninotto/faker": "^1.5",
     "sensiolabs/security-checker": "^4.1",
-    "symfony/security-bundle": "^3.1|^4.0",
     "symfony/twig-bundle": "^3.3|^4.0",
     "doctrine/cache": "^1.6",
     "symfony/debug-bundle": "^3.3|^4.0",
     "symfony/web-profiler-bundle": "^3.3|^4.0",
     "symfony/web-server-bundle": "^3.3|^4.0",
     "symfony/browser-kit": "^3.3|^4.0",
-    "friendsofphp/php-cs-fixer": "^2.8"
+    "friendsofphp/php-cs-fixer": "2.13.0"
   },
   "autoload": {
     "psr-4": {

phpunit.xml.dist

@@ -10,6 +10,8 @@
     <php>
         <server name="KERNEL_DIR" value="tests/Resources/app" />
         <server name="KERNEL_CLASS" value="\AppKernel" />
+        <!-- \Doctrine\Common\ClassLoader is deprecated in doctrine/common v2.9.0 -->
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="1" />
     </php>
     <testsuites>
         <testsuite name="Unit">

src/Bridge/Doctrine/DoctrineRepository.php

@@ -22,9 +22,6 @@ class DoctrineRepository implements RepositoryInterface
 
     /**
      * DoctrineRepository constructor.
-     *
-     * @param EntityRepository $entityRepository
-     * @param EntityManager $entityManager
      */
     public function __construct(EntityRepository $entityRepository, EntityManager $entityManager)
     {

src/Bridge/Doctrine/ObjectListCollection.php

@@ -19,20 +19,17 @@ class ObjectListCollection implements ObjectListCollectionInterface
 
     /**
      * ObjectListCollection constructor.
-     *
-     * @param array $collection
-     * @param null $total
      */
     public function __construct(array $collection, $total = null)
     {
-        if (false === is_array($collection) || null === $collection) {
+        if (false === \is_array($collection) || null === $collection) {
             $collection = [];
         }
         $this->collection = $collection;
 
         // if null, we presume full list is returned
         if (null === $total) {
-            $total = count($collection);
+            $total = \count($collection);
         }
 
         $this->total = $total;

src/Bridge/Doctrine/RepositoryFactory.php

@@ -6,6 +6,9 @@
 use Trikoder\JsonApiBundle\Contracts\RepositoryInterface;
 use Trikoder\JsonApiBundle\Repository\RepositoryFactoryInterface;
 
+/**
+ * @deprecated @see \Trikoder\JsonApiBundle\Repository\RepositoryFactoryInterface
+ */
 class RepositoryFactory implements RepositoryFactoryInterface
 {
     /**
@@ -15,18 +18,14 @@ class RepositoryFactory implements RepositoryFactoryInterface
 
     /**
      * RepositoryFactory constructor.
-     *
-     * @param EntityManager $entityManager
      */
     public function __construct(EntityManager $entityManager)
     {
         $this->entityManager = $entityManager;
     }
 
     /**
-     * @param string $modelClass
      *
-     * @return RepositoryInterface
      */
     public function create(string $modelClass): RepositoryInterface
     {