Merge branch 'master' into connector-cloudinary

akeneo · Oct 4, 2019 · 0e60a73 · 0e60a73
2 parents 15e5427 + 36e9263
commit 0e60a73
Show file tree

Hide file tree

Showing 46 changed files with 1,512 additions and 157 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,8 @@
 ###> docker ###
 docker-compose.override.yml
 ###< docker ###
+
+###> friendsofphp/php-cs-fixer ###
+/.php_cs
+/.php_cs.cache
+###< friendsofphp/php-cs-fixer ###
diff --git a/.phpspec.yml b/.phpspec.yml
@@ -0,0 +1,7 @@
+suites:
+  dam-connector:
+    namespace: AkeneoDAMConnector
+    psr4_prefix: AkeneoDAMConnector
+    spec_path: tests/
+    spec_prefix: Specification
+    src_path: src/
diff --git a/composer.json b/composer.json
@@ -26,7 +26,8 @@
         "symfony/yaml": "4.3.*"
     },
     "require-dev": {
-        "akeneo/php-coupling-detector": "0.3.*"
+        "akeneo/php-coupling-detector": "0.3.*",
+        "phpspec/phpspec": "^4.0"
     },
     "repositories": [
         {
@@ -38,7 +39,8 @@
         "preferred-install": {
             "*": "dist"
         },
-        "sort-packages": true
+        "sort-packages": true,
+        "bin-dir": "vendor/bin"
     },
     "autoload": {
         "psr-4": {