Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
161375f
Do not append `body` parameter if it already exists
maks-rafalko Oct 1, 2019
4c67031
Run php-cs-fixer
maks-rafalko Oct 1, 2019
2f80d1e
Push resources as fetch - Fix #3107
bpolaszek Oct 1, 2019
b5e933e
Merge pull request #3125 from bpolaszek/fix-3107
dunglas Oct 1, 2019
fbf69f0
Update thrown exception and clarify error message.
Taminoful Oct 1, 2019
d38d96c
add missing oauth2-redirect configuration
Oct 2, 2019
717596b
fix cs
Oct 2, 2019
435d493
Bugfix: Notice: Undefined index: method thrown in SerializerContextBu…
mhbert Oct 2, 2019
6ea8030
MongoDB ODM 2.0 has been released (#3143)
alanpoulain Oct 3, 2019
b501e39
Add test for updating embedded relation using plain identifier
teohhanhui Oct 3, 2019
cd650f8
Merge pull request #3134 from WhiteRabbitDE/fix-oauth2-implicit-workflow
soyuka Oct 4, 2019
b77e7b3
Allow multiple elasticsearch queries to be set
zoltanbalint Oct 2, 2019
feec91f
Merge remote-tracking branch 'upstream/2.4' into merge-24-25
soyuka Oct 4, 2019
749fb70
Merge pull request #3145 from teohhanhui/test-update-embedded-relatio…
soyuka Oct 4, 2019
c5e9168
Update src/Swagger/Serializer/DocumentationNormalizer.php
maks-rafalko Oct 4, 2019
ddfec09
Update src/Swagger/Serializer/DocumentationNormalizer.php
maks-rafalko Oct 4, 2019
83cd888
Merge pull request #3148 from soyuka/merge-24-25
teohhanhui Oct 4, 2019
81f819b
Merge pull request #3123 from maks-rafalko/bugfix/aboid-miltiple-body…
soyuka Oct 4, 2019
d29b8ad
Merge pull request #3140 from zoltanbalint/elastic-combined-filters
soyuka Oct 4, 2019
5368930
Update thrown error code to 404.
Taminoful Oct 1, 2019
a807e84
non-int value in the execute command will be deprecated
maxhelias Oct 5, 2019
3a648f2
Merge pull request #3152 from maxhelias/deprecated-console
soyuka Oct 5, 2019
8011f35
Fix typos in ApiTestCase
antograssiot Oct 6, 2019
c5af156
Merge pull request #3156 from antograssiot/typos
soyuka Oct 6, 2019
0f91a71
Merge pull request #3132 from Taminoful/2.5
soyuka Oct 6, 2019
e25cfde
Fixed dependency issue when SecurityBundle is not installed (#3149)
reypm Oct 7, 2019
d8e624b
Possibility to add execute options for MongoDB (#3144)
alanpoulain Oct 7, 2019
4d4ee37
Feat: remove template pull request
toofff Oct 2, 2019
a4c8af6
Merge pull request #3137 from toofff/feat-remove-template-pull-request
dunglas Oct 14, 2019
18473eb
Don't run phpunit tests on Travis
teohhanhui Sep 6, 2019
b81ca8d
Install Symfony Flex and whitelist supported Symfony package versions
teohhanhui Oct 14, 2019
1931f16
Context stamp (#3157)
Oct 14, 2019
c5b46f6
Update CHANGELOG.md
SinithH Oct 11, 2019
dfc1771
Merge branch '2.5'
dunglas Oct 14, 2019
f53ab10
Fixed HAL url broken link and added ssl urls
wenzdey Oct 5, 2019
74ee7ef
Global resource defaults implementation (#3151)
bpolaszek Oct 14, 2019
b959c6a
Move phpunit tests for postgres and mysql to CI workflow on GitHub Ac…
teohhanhui Oct 14, 2019
10bb648
Move phpunit tests for mongodb and elasticsearch to CI workflow on Gi…
teohhanhui Oct 14, 2019
1607fc7
Merge pull request #3054 from teohhanhui/make-ci-fast-again
teohhanhui Oct 15, 2019
5302c08
Merge branch '2.4' into merge-2.4
teohhanhui Oct 15, 2019
bac00c1
Merge pull request #3178 from teohhanhui/merge-2.4
teohhanhui Oct 15, 2019
f3312a7
Merge branch '2.5' into merge-2.5
teohhanhui Oct 15, 2019
0baa504
Update HAL link to point to latest draft
teohhanhui Oct 15, 2019
3c371aa
Merge pull request #3179 from teohhanhui/merge-2.5
teohhanhui Oct 15, 2019
966f7bf
Update Problem Details link to point to RFC
teohhanhui Oct 15, 2019
4d0b777
Merge pull request #3180 from api-platform/fix/problem-details-link-rfc
teohhanhui Oct 15, 2019
974d8bc
Fix dashed path segment generation
antograssiot Oct 17, 2019
7776e9f
Merge pull request #3187 from antograssiot/dashed--path-segment-gener…
teohhanhui Oct 18, 2019
724ac49
Fix support for custom filters without constructor in ApiFilter annot…
Oct 3, 2019
bf1bed1
Merge pull request #3166 from LouisPinsard/allow-api-filter-without-c…
soyuka Oct 18, 2019
89e3098
Improve mysql performance on Travis
Oct 19, 2019
4b469eb
Merge pull request #3194 from momozor/travis-mysql-perf
teohhanhui Oct 19, 2019
2e13147
Move behat tests to CI workflow on GitHub Actions
teohhanhui Oct 19, 2019
841d2e8
Fix test for GraphQL mutation type introspection
teohhanhui Oct 20, 2019
45c8f9b
Merge pull request #3197 from teohhanhui/behat-on-github-actions
soyuka Oct 22, 2019
4d40da1
Add .gitattributes
alexsegura Oct 22, 2019
6164ab0
Merge pull request #3199 from alexsegura/gitattributes
teohhanhui Oct 22, 2019
bf1cd14
Fix phpstan constraint to < 0.11.17
soyuka Oct 22, 2019
9425f08
Merge pull request #3200 from soyuka/fix-phpstan
soyuka Oct 22, 2019
732d442
fix #3189 - JSONAPI pagination ignored when using filter parameter
wcoppens Oct 22, 2019
3cab522
DI: Improve swagger versions parameter (fix #3115)
soyuka Oct 11, 2019
2ef093b
Merge pull request #3167 from soyuka/fix-swagger-versions
soyuka Oct 23, 2019
ec00f0a
Feature : Catch wrong identifier type
Zowac Oct 1, 2019
8dffbce
Merge pull request #3127 from Zowac/catch-wrong-identifier-type
soyuka Oct 23, 2019
1e7d7ed
Merge remote-tracking branch 'upstream/2.5' into merge-25
soyuka Oct 23, 2019
480c077
Merge pull request #3202 from soyuka/merge-25
soyuka Oct 23, 2019
c5a6f1a
Add links to documentation to ApiResource properties
edamov Oct 25, 2019
a3f3fe1
Merge pull request #3204 from edamov/master
teohhanhui Oct 25, 2019
373812a
Fix removal of illegal characters in schema name for Amazon API Gateway
MLDMoritz Oct 22, 2019
4ef5531
Merge pull request #3196 from MLDMoritz/patch/apigateway
teohhanhui Oct 25, 2019
8eadb3e
Fix spelling
hugovk Oct 27, 2019
07d13d9
Merge pull request #3210 from hugovk/2.5-fix-spelling
teohhanhui Oct 27, 2019
8e21ef2
Make the base exception extend throwable
BackEndTea Oct 28, 2019
21bbe95
Use https instead of http
BackEndTea Oct 28, 2019
59a1702
Merge pull request #3219 from BackEndTea/patch-3
dunglas Oct 28, 2019
449842a
Merge pull request #3217 from BackEndTea/patch-1
dunglas Oct 28, 2019
79e4b86
Merge pull request #3201 from Enelogic/2.5
dunglas Oct 28, 2019
b125b66
Merge branch '2.5'
dunglas Oct 29, 2019
d22dda9
Link to local XSD (#3218)
BackEndTea Oct 31, 2019
ddf170b
Oct 31, 2019
906aaa2
Merge pull request #3231 from soyuka/patch/readable-names
dunglas Nov 1, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 45 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ commands:
disable-xdebug-php-extension:
steps:
- run:
name: Disable Xdebug PHP extension
name: Disable xdebug PHP extension
command: sudo rm /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
install-mongodb-php-extension:
steps:
Expand All @@ -46,6 +46,13 @@ commands:
command: |
sudo pecl install pcov-1.0.6
sudo docker-php-ext-enable pcov
install-symfony-flex:
steps:
- run:
name: Install Symfony Flex
command: |
composer global require --prefer-dist --no-progress --no-suggest --ansi \
symfony/flex
merge-code-coverage-reports:
parameters:
dir:
Expand Down Expand Up @@ -88,68 +95,80 @@ commands:
restore-composer-cache:
steps:
- restore_cache:
name: Restore Composer cache
keys:
- composer-cache-{{ .Revision }}
- composer-cache-{{ .Branch }}
- composer-cache
restore-npm-cache:
steps:
- restore_cache:
name: Restore npm cache
keys:
- npm-cache-{{ .Revision }}
- npm-cache-{{ .Branch }}
- npm-cache
restore-php-cs-fixer-cache:
steps:
- restore_cache:
name: Restore PHP-CS-Fixer cache
keys:
- php-cs-fixer-cache-{{ .Revision }}
- php-cs-fixer-cache-{{ .Branch }}
- php-cs-fixer-cache
restore-phpstan-cache:
steps:
- restore_cache:
name: Restore PHPStan cache
keys:
- phpstan-cache-{{ .Revision }}
- phpstan-cache-{{ .Branch }}
- phpstan-cache
save-composer-cache:
steps:
- save_cache:
name: Save Composer cache
paths:
- ~/.composer/cache
- ~/.composer/cache/files
key: composer-cache-{{ .Branch }}-{{ .BuildNum }}
- save_cache:
name: Save Composer cache
paths:
- ~/.composer/cache
- ~/.composer/cache/files
key: composer-cache-{{ .Revision }}-{{ .BuildNum }}
save-npm-cache:
steps:
- save_cache:
name: Save npm cache
paths:
- ~/.npm
key: npm-cache-{{ .Branch }}-{{ .BuildNum }}
- save_cache:
name: Save npm cache
paths:
- ~/.npm
key: npm-cache-{{ .Revision }}-{{ .BuildNum }}
save-php-cs-fixer-cache:
steps:
- save_cache:
name: Save PHP-CS-Fixer cache
paths:
- .php_cs.cache
key: php-cs-fixer-cache-{{ .Branch }}-{{ .BuildNum }}
- save_cache:
name: Save PHP-CS-Fixer cache
paths:
- .php_cs.cache
key: php-cs-fixer-cache-{{ .Revision }}-{{ .BuildNum }}
save-phpstan-cache:
steps:
- save_cache:
name: Save PHPStan cache
paths:
- /tmp/phpstan/cache
key: phpstan-cache-{{ .Branch }}-{{ .BuildNum }}
- save_cache:
name: Save PHPStan cache
paths:
- /tmp/phpstan/cache
key: phpstan-cache-{{ .Revision }}-{{ .BuildNum }}
Expand Down Expand Up @@ -201,27 +220,34 @@ executors:
php:
docker:
- image: circleci/php:7.3-node
environment:
SYMFONY_REQUIRE: ^3.4 || ^4.0
php-and-elasticsearch:
docker:
- image: circleci/php:7.3-node
# https://github.com/elastic/elasticsearch-docker/issues/84
- image: docker.elastic.co/elasticsearch/elasticsearch:6.7.2
environment:
SYMFONY_REQUIRE: ^3.4 || ^4.0
- image: docker.elastic.co/elasticsearch/elasticsearch:6.8.3 # https://github.com/elastic/elasticsearch/issues/43627
php-and-mongodb:
docker:
- image: circleci/php:7.3-node
environment:
SYMFONY_REQUIRE: ^3.4 || ^4.0
- image: circleci/mongo:4

jobs:
php-cs-fixer:
description: PHP-CS-Fixer
executor: php
environment:
PHP_CS_FIXER_FUTURE_MODE: 1
PHP_CS_FIXER_FUTURE_MODE: '1'
working_directory: ~/api-platform/core
steps:
- checkout
- disable-xdebug-php-extension
- disable-php-memory-limit
- restore-composer-cache
- install-symfony-flex
- run:
name: Install PHP-CS-Fixer
command: |
Expand All @@ -237,17 +263,18 @@ jobs:
- save-php-cs-fixer-cache

phpstan:
description: PHPStan
executor: php
environment:
# https://github.com/phpstan/phpstan-symfony/issues/37
APP_DEBUG: 1
APP_DEBUG: '1' # https://github.com/phpstan/phpstan-symfony/issues/37
working_directory: ~/api-platform/core
steps:
- checkout
- install-mongodb-php-extension
- disable-xdebug-php-extension
- disable-php-memory-limit
- restore-composer-cache
- install-symfony-flex
- update-project-dependencies
- save-composer-cache
- clear-test-app-cache
Expand All @@ -258,6 +285,7 @@ jobs:
- save-phpstan-cache

phpunit-coverage:
description: PHPUnit (code coverage)
executor: php
parallelism: 2
working_directory: ~/api-platform/core
Expand All @@ -268,6 +296,7 @@ jobs:
- disable-xdebug-php-extension
- disable-php-memory-limit
- restore-composer-cache
- install-symfony-flex
- update-project-dependencies
- save-composer-cache
- clear-test-app-cache
Expand Down Expand Up @@ -305,6 +334,7 @@ jobs:
- save-npm-cache

behat-coverage:
description: Behat (code coverage)
executor: php
parallelism: 2
working_directory: ~/api-platform/core
Expand All @@ -315,6 +345,7 @@ jobs:
- disable-xdebug-php-extension
- disable-php-memory-limit
- restore-composer-cache
- install-symfony-flex
- update-project-dependencies
- save-composer-cache
- clear-test-app-cache
Expand Down Expand Up @@ -349,6 +380,7 @@ jobs:
- save-npm-cache

phpunit-mongodb-coverage:
description: PHPUnit (MongoDB) (code coverage)
executor: php-and-mongodb
environment:
APP_ENV: mongodb
Expand All @@ -360,6 +392,7 @@ jobs:
- disable-xdebug-php-extension
- disable-php-memory-limit
- restore-composer-cache
- install-symfony-flex
- update-project-dependencies
- save-composer-cache
- clear-test-app-cache
Expand All @@ -386,6 +419,7 @@ jobs:
- save-npm-cache

behat-mongodb-coverage:
description: Behat (MongoDB) (code coverage)
executor: php-and-mongodb
environment:
APP_ENV: mongodb
Expand All @@ -397,6 +431,7 @@ jobs:
- disable-xdebug-php-extension
- disable-php-memory-limit
- restore-composer-cache
- install-symfony-flex
- update-project-dependencies
- save-composer-cache
- clear-test-app-cache
Expand Down Expand Up @@ -429,6 +464,7 @@ jobs:
- save-npm-cache

behat-elasticsearch-coverage:
description: Behat (Elasticsearch) (code coverage)
executor: php-and-elasticsearch
environment:
APP_ENV: elasticsearch
Expand All @@ -440,6 +476,7 @@ jobs:
- disable-xdebug-php-extension
- disable-php-memory-limit
- restore-composer-cache
- install-symfony-flex
- update-project-dependencies
- save-composer-cache
- clear-test-app-cache
Expand Down
16 changes: 16 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/.circleci export-ignore
/.editorconfig export-ignore
/.gitattributes export-ignore
/.github export-ignore
/.gitignore export-ignore
/.php_cs.dist export-ignore
/.travis.yml export-ignore
/appveyor.yml export-ignore
/behat.yml.dist export-ignore
/features export-ignore
/phpstan.neon.dist export-ignore
/phpunit.xml.dist export-ignore
/phpunit_mongodb.xml export-ignore
/tests export-ignore
/update-js.sh export-ignore
/yarn.lock export-ignore
13 changes: 0 additions & 13 deletions .github/PULL_REQUEST_TEMPLATE.md

This file was deleted.

Loading