Merge pull request #18 from contentful/feat/php7

Upgrade to require PHP 7

Author: dborsatto

.circleci/config.yml

@@ -24,7 +24,7 @@ jobs:
       - run:
           name: Static analysis
           command: |
-            wget https://github.com/phpstan/phpstan/releases/download/0.9.2/phpstan.phar -q -O phpstan.phar
+            wget https://github.com/phpstan/phpstan/releases/download/0.10.3/phpstan.phar -q -O phpstan.phar
             composer run lint-static-analysis
 
   test56:
@@ -52,10 +52,22 @@ jobs:
       - run: { name: "Test suite", command: "composer test-quick-fail" }
 
   test72:
+    environment:
+      CC_TEST_REPORTER_ID: 12e3510bd320a9a0acecb33d12f6c95318256eab19ffd3cca5520705140ba836
     docker:
       - image: circleci/php:7.2-cli
     steps:
       - checkout
+      - run:
+          name: Set up Code Climate test-reporter
+          command: |
+            curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+            chmod +x ./cc-test-reporter
       - run: { name: "Install dependencies", command: "sudo composer self-update && composer install -n --prefer-dist" }
-      - run: { name: "Test suite", command: "composer test-quick-fail" }
-      - run: { name: "Upload code coverage", command: "bash <(curl -s https://codecov.io/bash) -f build/logs/clover.xml" }
+      - run:
+          name: Test suite
+          command: |
+            sudo docker-php-ext-enable xdebug
+            ./cc-test-reporter before-build
+            composer test-quick-fail
+            ./cc-test-reporter after-build --coverage-input-type clover --exit-code $?

.gitattributes

@@ -0,0 +1,11 @@
+* text=auto
+
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.editorconfig export-ignore
+/.php_cs export-ignore
+/phpunit.xml.dist export-ignore
+/tests export-ignore
+/sami.php export-ignore
+/.github export-ignore
+/UPGRADE-2.0.md

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @dborsatto

.gitignore

@@ -2,3 +2,4 @@
 /vendor/
 /composer.lock
 /.php_cs.cache
+/clover.xml

.php_cs

@@ -4,6 +4,6 @@ $config = require __DIR__.'/scripts/php-cs-fixer.php';
 
 return $config(
     'contentful-core',
-    false,
+    true,
     ['scripts', 'src', 'tests']
 );

CHANGELOG.md

@@ -5,6 +5,20 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased](https://github.com/contentful/contentful-core.php/compare/1.5.0...HEAD)
 
+### Upgrade
+
+Please refer to the [upgrade guide](UPGRADE-2.0.md) for detailed info about the new version.
+
+### Added
+
+* Class `Contentful\Core\File\ImageOptions` now has a `setPng8Bit` method which will force the image to be returned as a 8-bit PNG.
+* Interface `Contentful\Core\File\ProcessedFileInterface` has been introduced, and can be used to identify assets that have already been processed and have a `url` property available.
+
+### Changed
+
+* Class `Contentful\Core\Api\BaseClient` no longer has abstract method `getSdkVersion`, now instead it requires `getPackageName`. The version of the SDK will be inferred automatically using that value.
+* Options array in `Contentful\Core\Api\BaseClient::request` now uses property `host` instead of `baseUri`.
+
 ## [1.5.0](https://github.com/contentful/contentful-core.php/tree/1.5.0) (2018-08-30)
 
 ### Added
@@ -36,6 +50,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 * `Contentful\Core\Api\Location` used to provide a wrongful serialization of the longitude property. Now it correctly serializes to `lon` instead of `long`.
 
 ### Changed
+
 * The `Contentful\Core\Log\Timer` has been deprecated and will be removed in version 2.
 
 ## [1.0.0](https://github.com/contentful/contentful-core.php/tree/1.0.0) (2018-04-17)

UPGRADE-2.0.md

@@ -0,0 +1,29 @@
+# UPGRADE FROM 1.x to 2.0
+
+## PHP Version
+
+This SDK now requires PHP 7.0, which means all files now use the `strict_types` directive and scalar type declarations whenever possible.
+
+## Change in BaseClient abstract methods
+
+The class `Contentful\Core\Api\BaseClient` no longer requires the method `getSdkVersion` to be defined, but it now requires `getPackageName`, which should return the Packagist name (e.g. `contentful/core`). This name will then be used to automatically infer the SDK version number.
+
+## Change in BaseClient::request()
+
+Options array in `Contentful\Core\Api\BaseClient::request()` now uses property `host` instead of `baseUri`.
+
+## Removal of Timer class
+
+The class `Contentful\Core\Log\Timer` was deprecated in version 1.1 and has now been removed.
+
+## Removal of third parameter in Query::where()
+
+The method `Contentful\Core\Api\BaseQuery::where()` no longer accepts a third parameter. Now simply include that as part of the first parameter:
+
+```php
+// Before
+$query->where('sys.id', $someId, 'ne');
+
+// After
+$query->where('sys.id[ne]', $someId);
+```

composer.json

@@ -3,15 +3,16 @@
     "type": "library",
     "description": "Foundation library for Contentful PHP SDKs",
     "require": {
-        "php": "^5.6|^7.0",
+        "php": "^7.0",
         "ext-json": "*",
         "guzzlehttp/guzzle": "^6.3",
         "guzzlehttp/psr7": "^1.4",
         "psr/http-message": "^1.0",
-        "psr/log": "^1.0"
+        "psr/log": "^1.0",
+        "jean85/pretty-package-versions": "^1.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7",
+        "phpunit/phpunit": "^6.0|7.0",
         "symfony/finder": "^3.0|^4.0",
         "monolog/monolog": "^1.23"
     },
@@ -24,7 +25,8 @@
     "autoload-dev": {
         "psr-4": {
             "Contentful\\Tests\\Core\\": "tests"
-        }
+        },
+        "files": ["scripts/TestCase.php"]
     },
     "scripts": {
         "test": "vendor/bin/phpunit",
@@ -34,7 +36,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.6.0-dev"
+            "dev-master": "2.0.0-dev"
         }
     }
 }

phpstan.phar

@@ -8,7 +8,7 @@
 
     <logging>
         <log type="coverage-html" target="build/coverage" title="contentful-core.php" lowUpperBound="35" highLowerBound="70" />
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
+        <log type="coverage-clover" target="clover.xml"/>
     </logging>
 
     <filter>