Skip to content

Commit b3edc3d

Browse files
alenpokosalenpokos
committed
Update from internal 0.14 release
1 parent a20092c commit b3edc3d

File tree

128 files changed

+1366
-488
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+1366
-488
lines changed

‎.gitlab-ci.yml

+95-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ variables:
22
COMPOSE_PROJECT_NAME: "jsonapibundle${CI_BUILD_ID}"
33

44
stages:
5-
- test
5+
- test-latest
66
- lint
7+
- test-versions
78

89
after_script:
910
- cd tests/Resources/docker/
@@ -12,8 +13,9 @@ after_script:
1213
- docker-compose down
1314
- echo "All Done!"
1415

15-
ci:
16-
stage: test
16+
# any latest built
17+
ci-latest:
18+
stage: test-latest
1719
tags:
1820
- docker-compose
1921
script:
@@ -23,6 +25,96 @@ ci:
2325
- docker-compose run --no-deps --rm php php vendor/bin/phpunit --debug --colors=never --coverage-text=php://stdout --coverage-html=logs/coverage
2426
- bin/php php ../../../vendor/bin/security-checker security:check ../../../composer.lock
2527

28+
# symfony 4.1 build
29+
ci-symfony4.1:
30+
stage: test-versions
31+
tags:
32+
- docker-compose
33+
script:
34+
- cd tests/Resources/docker/
35+
- docker-compose build
36+
- docker-compose up -d
37+
- bin/composer require "symfony/framework-bundle:^4.1" "symfony/form:^4.1" "symfony/validator:^4.1" --no-interaction --no-ansi --prefer-dist
38+
- docker-compose run --no-deps --rm php composer install --no-interaction --no-ansi --prefer-dist
39+
- bin/setup_fixtures.sh
40+
- docker-compose run --no-deps --rm php php vendor/bin/phpunit --debug --colors=never
41+
42+
# supported 4.0 build
43+
ci-symfony4.0:
44+
stage: test-versions
45+
tags:
46+
- docker-compose
47+
script:
48+
- cd tests/Resources/docker/
49+
- docker-compose build
50+
- docker-compose up -d
51+
- bin/composer require "symfony/framework-bundle:^4.0" "symfony/form:^4.0" "symfony/validator:^4.0" --no-interaction --no-ansi --prefer-dist
52+
- docker-compose run --no-deps --rm php composer install --no-interaction --no-ansi --prefer-dist
53+
- bin/setup_fixtures.sh
54+
- docker-compose run --no-deps --rm php php vendor/bin/phpunit --debug --colors=never
55+
56+
# supported 3.4 build
57+
ci-symfony3.4:
58+
stage: test-versions
59+
tags:
60+
- docker-compose
61+
script:
62+
- cd tests/Resources/docker/
63+
- docker-compose build
64+
- docker-compose up -d
65+
- mv -f ../app/config/symfony34/config.yml ../app/config/
66+
- bin/composer require "symfony/framework-bundle:^3.4" "symfony/form:^3.4" "symfony/validator:^3.4" --no-interaction --no-ansi --prefer-dist
67+
- docker-compose run --no-deps --rm php composer install --no-interaction --no-ansi --prefer-dist
68+
- bin/setup_fixtures.sh
69+
- docker-compose run --no-deps --rm php php vendor/bin/phpunit --debug --colors=never
70+
71+
# un-supported 3.3 build
72+
ci-symfony3.3:
73+
stage: test-versions
74+
tags:
75+
- docker-compose
76+
script:
77+
- cd tests/Resources/docker/
78+
- docker-compose build
79+
- docker-compose up -d
80+
- mv -f ../app/config/symfony34/config.yml ../app/config/
81+
- bin/composer require "symfony/framework-bundle:^3.3" "symfony/form:^3.3" "symfony/validator:^3.3" --no-interaction --no-ansi --prefer-dist
82+
- docker-compose run --no-deps --rm php composer install --no-interaction --no-ansi --prefer-dist
83+
- bin/setup_fixtures.sh
84+
- docker-compose run --no-deps --rm php php vendor/bin/phpunit --debug --colors=never
85+
86+
87+
# un-supported 3.2 build
88+
ci-symfony3.2:
89+
stage: test-versions
90+
tags:
91+
- docker-compose
92+
script:
93+
- cd tests/Resources/docker/
94+
- docker-compose build
95+
- docker-compose up -d
96+
- mv -f ../app/config/symfony34/config.yml ../app/config/
97+
- bin/composer require "symfony/framework-bundle:^3.2" "symfony/form:^3.2" "symfony/validator:^3.2" --no-interaction --no-ansi --prefer-dist
98+
- docker-compose run --no-deps --rm php composer install --no-interaction --no-ansi --prefer-dist
99+
- bin/setup_fixtures.sh
100+
- docker-compose run --no-deps --rm php php vendor/bin/phpunit --debug --colors=never
101+
102+
103+
# supported 3.1 build
104+
ci-symfony3.1:
105+
stage: test-versions
106+
tags:
107+
- docker-compose
108+
script:
109+
- cd tests/Resources/docker/
110+
- docker-compose build
111+
- docker-compose up -d
112+
- mv -f ../app/config/symfony34/config.yml ../app/config/
113+
- bin/composer require "symfony/framework-bundle:^3.1" "symfony/form:^3.1" "symfony/validator:^3.1" --no-interaction --no-ansi --prefer-dist
114+
- docker-compose run --no-deps --rm php composer install --no-interaction --no-ansi --prefer-dist
115+
- bin/setup_fixtures.sh
116+
- docker-compose run --no-deps --rm php php vendor/bin/phpunit --debug --colors=never
117+
26118
lint:
27119
stage: lint
28120
tags:

‎.php_cs.dist

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ $finder = PhpCsFixer\Finder::create()
88
__DIR__ . '/src',
99
__DIR__ . '/tests',
1010
])
11+
->exclude('cache')
1112
;
1213

1314
return PhpCsFixer\Config::create()
@@ -37,6 +38,7 @@ return PhpCsFixer\Config::create()
3738
'yoda_style' => true,
3839
'compact_nullable_typehint' => true,
3940
'visibility_required' => true,
41+
'no_superfluous_phpdoc_tags' => true,
4042
])
4143
->setRiskyAllowed(true)
4244
->setFinder($finder)

‎CHANGELOG.md

+22-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,30 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

7-
## [Unreleased]
7+
## Unreleased
88

9+
## [0.14.0] 2018-10-23
910

11+
### Added
12+
- Added support for automatically mapped schema files, see [schema automapping docs](src/Resources/doc/getting_started/schema_automapping.md)
13+
- Implemented support for required roles config directive, see [config reference](src/Resources/doc/configuration/configuration.md)
14+
15+
### Changed
16+
- `\Trikoder\JsonApiBundle\Controller\AbstractController` is now auto-tagged with the `controller.service_arguments` tag.
17+
18+
19+
## [0.11.0] 2018-08-03
20+
21+
### Changed
22+
- Changed route annotation use to symfony/routing, previously was sensio/framework-extra-bundle
23+
- Added symfony/routing as dependancy on 3.4
24+
- Added "doctrine/common": "<2.9" as dependancy to cover deprication notices
25+
26+
### Removed
27+
- Removed second argument (ServiceContainer) of schema as closure definition. see [Manual](src/Resources/doc/getting_started/schema_class_map.md)
28+
29+
### Deprecated
30+
- Deprecated RepositoryFactoryInterface (`\Trikoder\JsonApiBundle\Repository\RepositoryFactoryInterface`) in favour of using DIC factory options
1031

1132
## [0.1.0] 2017-07-27
1233

‎README.md

+2
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ Copyright (C) 2017 Trikoder
9090

9191
Author: Alen Pokos.
9292

93+
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
94+
9395
## License
9496

9597
Package is licensed under [MIT License](./LICENSE)

‎composer.json

+13-12
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,35 @@
44
"type": "symfony-bundle",
55
"require": {
66
"php": ">=7.0.0|>=7.1.0",
7-
"symfony/framework-bundle": "^3.1|^4.0",
8-
"symfony/dependency-injection": "^3.1|^4.0",
7+
"symfony/framework-bundle": ">=3.1 <5.0",
8+
"symfony/dependency-injection": ">=3.1 <5.0",
9+
"sensio/framework-extra-bundle": ">3.0|^5.1|^5.2",
10+
"symfony/form": ">=3.1 <5.0",
11+
"symfony/routing": ">=3.1 <5.0",
12+
"symfony/security-bundle": "^3.1|^4.0",
13+
"symfony/translation": ">=3.1 <5.0",
14+
"symfony/validator": ">=3.1 <5.0",
15+
"symfony/monolog-bundle": ">=3.1 <5.0",
916
"neomerx/json-api": "^1.0",
10-
"doctrine/orm": "~2.4,<2.5|2.5|^2.6",
11-
"doctrine/doctrine-bundle": "~1.6|^1.8",
12-
"sensio/framework-extra-bundle": "^3.0|^5.1",
13-
"symfony/form": "^3.1|^4.0",
14-
"symfony/translation": "^3.3|^4.0",
15-
"symfony/validator": "^3.3|^4.0",
16-
"symfony/monolog-bundle": "^3.1"
17+
"doctrine/orm": "^2.4",
18+
"doctrine/common": "^2",
19+
"doctrine/doctrine-bundle": "~1.6|^1.8|^1.9"
1720
},
1821
"require-dev": {
19-
"sensio/generator-bundle": "3.0.*|3.1.*|3.2.*|3.3.*",
2022
"phpunit/phpunit": "^5.7",
2123
"phpunit/php-code-coverage": "^4.0",
2224
"symfony/phpunit-bridge": "^3.0|^4.0",
2325
"justinrainbow/json-schema": "^1.6",
2426
"doctrine/doctrine-fixtures-bundle": "^2.3",
2527
"fzaninotto/faker": "^1.5",
2628
"sensiolabs/security-checker": "^4.1",
27-
"symfony/security-bundle": "^3.1|^4.0",
2829
"symfony/twig-bundle": "^3.3|^4.0",
2930
"doctrine/cache": "^1.6",
3031
"symfony/debug-bundle": "^3.3|^4.0",
3132
"symfony/web-profiler-bundle": "^3.3|^4.0",
3233
"symfony/web-server-bundle": "^3.3|^4.0",
3334
"symfony/browser-kit": "^3.3|^4.0",
34-
"friendsofphp/php-cs-fixer": "^2.8"
35+
"friendsofphp/php-cs-fixer": "2.13.0"
3536
},
3637
"autoload": {
3738
"psr-4": {

‎phpunit.xml.dist

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
<php>
1111
<server name="KERNEL_DIR" value="tests/Resources/app" />
1212
<server name="KERNEL_CLASS" value="\AppKernel" />
13+
<!-- \Doctrine\Common\ClassLoader is deprecated in doctrine/common v2.9.0 -->
14+
<env name="SYMFONY_DEPRECATIONS_HELPER" value="1" />
1315
</php>
1416
<testsuites>
1517
<testsuite name="Unit">

‎src/Bridge/Doctrine/DoctrineRepository.php

-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ class DoctrineRepository implements RepositoryInterface
2222

2323
/**
2424
* DoctrineRepository constructor.
25-
*
26-
* @param EntityRepository $entityRepository
27-
* @param EntityManager $entityManager
2825
*/
2926
public function __construct(EntityRepository $entityRepository, EntityManager $entityManager)
3027
{

‎src/Bridge/Doctrine/ObjectListCollection.php

+2-5
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,17 @@ class ObjectListCollection implements ObjectListCollectionInterface
1919

2020
/**
2121
* ObjectListCollection constructor.
22-
*
23-
* @param array $collection
24-
* @param null $total
2522
*/
2623
public function __construct(array $collection, $total = null)
2724
{
28-
if (false === is_array($collection) || null === $collection) {
25+
if (false === \is_array($collection) || null === $collection) {
2926
$collection = [];
3027
}
3128
$this->collection = $collection;
3229

3330
// if null, we presume full list is returned
3431
if (null === $total) {
35-
$total = count($collection);
32+
$total = \count($collection);
3633
}
3734

3835
$this->total = $total;

‎src/Bridge/Doctrine/RepositoryFactory.php

+3-4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
use Trikoder\JsonApiBundle\Contracts\RepositoryInterface;
77
use Trikoder\JsonApiBundle\Repository\RepositoryFactoryInterface;
88

9+
/**
10+
* @deprecated @see \Trikoder\JsonApiBundle\Repository\RepositoryFactoryInterface
11+
*/
912
class RepositoryFactory implements RepositoryFactoryInterface
1013
{
1114
/**
@@ -15,18 +18,14 @@ class RepositoryFactory implements RepositoryFactoryInterface
1518

1619
/**
1720
* RepositoryFactory constructor.
18-
*
19-
* @param EntityManager $entityManager
2021
*/
2122
public function __construct(EntityManager $entityManager)
2223
{
2324
$this->entityManager = $entityManager;
2425
}
2526

2627
/**
27-
* @param string $modelClass
2828
*
29-
* @return RepositoryInterface
3029
*/
3130
public function create(string $modelClass): RepositoryInterface
3231
{

0 commit comments

Comments
 (0)