Merge branch 'master' into delete-product-model

Author: tomglvng

.circleci/config.yml

@@ -0,0 +1,86 @@
+version: 2.1
+
+jobs:
+    build:
+        docker:
+            -   image: akeneo/php:7.2
+        steps:
+            -   checkout
+            -   run: composer install
+            -   persist_to_workspace:
+                    root: ~/
+                    paths:
+                        - project
+
+    test_php:
+        docker:
+            -   image: akeneo/php:7.2
+        steps:
+            -   attach_workspace:
+                    at: ~/
+            -   run: bin/phpunit -c phpunit.xml.dist
+            -   run: bin/phpspec run
+
+    test_php_code_style:
+        docker:
+            -   image: akeneo/php:7.2
+        steps:
+            -   attach_workspace:
+                    at: ~/
+            -   run: bin/php-cs-fixer fix --diff --dry-run --config=.php_cs.php -vvv
+
+    workflow_success:
+        docker:
+            -   image: akeneo/php:7.2
+        steps:
+            - run:
+                  name: Success
+                  command: echo "The build has run with success! Let's merge :)"
+
+workflows:
+    pull_request:
+        jobs:
+            -   wait_for_user_approval:
+                    type: approval
+                    filters:
+                        branches:
+                            ignore:
+                                - master
+            -   build:
+                    requires:
+                        - wait_for_user_approval
+            -   test_php:
+                    requires:
+                        - build
+            -   test_php_code_style:
+                    requires:
+                        - build
+            -   workflow_success:
+                    requires:
+                        - test_php
+                        - test_php_code_style
+
+    after_merge:
+        jobs:
+            -   build:
+                    filters:
+                        branches:
+                            only:
+                                - master
+            -   test_php:
+                    requires:
+                        - build
+            -   test_php_code_style:
+                    requires:
+                        - build
+
+    nightly:
+        when:
+            and:
+                -   equal: [ scheduled_pipeline, << pipeline.trigger_source >> ]
+                -   equal: [ "nightly_master", << pipeline.schedule.name >> ]
+        jobs:
+            -   build
+            -   test_php:
+                    requires:
+                        -   build

.travis.yml

@@ -0,0 +1,19 @@
+# Contributing
+
+Want to do your bit for our PHP client? All contributions are warmly welcomed!
+
+## Contribution process
+
+First and foremost, please accept and sign our [Contributor License Agreement](https://www.akeneo.com/contributor-license-agreement/).
+
+And then, do your magic :
+* Fork our repository
+* Create a branch (choose a descriptive name)
+* Work on your own code (don't forget to add necessessaries tests)
+* Commit your branch and submit a pull request to our projet
+
+At this moment, the ball is in our court: we will check your PR and add comments or suggestions if needed.
+
+When everything is ok, we merge your work.
+
+Congratulations, you are officially a contributor to our dear PHP client!

CONTRIBUTING.md

@@ -10,7 +10,7 @@ Matrix compatibility:
 | v2.1 - v2.2     | v2.0                    |  March 2019    | [![Build Status](https://travis-ci.org/akeneo/api-php-client.svg?branch=2.0)](https://travis-ci.org/akeneo/api-php-client)   |
 | v2.3            | v3.0                    |  December 2019 | [![Build Status](https://travis-ci.org/akeneo/api-php-client.svg?branch=3.0)](https://travis-ci.org/akeneo/api-php-client)   |
 | v3.0            | v4.0                    |  August 2020   | [![Build Status](https://travis-ci.org/akeneo/api-php-client.svg?branch=4.0)](https://travis-ci.org/akeneo/api-php-client)   |
-| -               | master                  |  -             | [![Build Status](https://travis-ci.org/akeneo/api-php-client.svg?branch=master)](https://travis-ci.org/akeneo/api-php-client)|
+| -               | master                  |  -             | [![CircleCI](https://circleci.com/gh/akeneo/api-php-client/tree/master.svg?style=svg)](https://circleci.com/gh/akeneo/api-php-client/tree/master)|
 
 Note that our PHP client is backward compatible.
 For example, if your PIM is currently a v2.3, you can still use a 1.0 version of the PHP client. The new endpoints available in v2.3 will not be available in the v1.0 of the PHP client.
@@ -161,3 +161,9 @@ The support of this client is made in best effort by our Akeneo team.
 
 If you find a bug or want to submit an improvement, don't hesitate to raise an issue on Github.
 Also, you can ask questions and discuss about the PHP client with the community in the [Slack User Group](https://akeneopim-ug.slack.com/messages/web-api/).
+
+## Contributing
+
+As this PHP client is an open-source project, all contributions are very welcome!
+
+For more information, please consult [the contributing section](CONTRIBUTING.md)