Merge pull request #235 from plank/fix-load-image-contents

Load intervention image with file contents instead of stream

Author: frasmage

.github/workflows/automated-test.yml

@@ -0,0 +1,63 @@
+name: PHPUnit Tests
+on: [push]
+jobs:
+  phpunit:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php-versions: ['7.3', '7.4']
+        prefer-lowest: ['','--prefer-lowest']
+    name: PHP ${{ matrix.php-versions }} ${{ matrix.prefer-lowest }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: gd
+          coverage: pcov
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-${{ matrix.php-version }}${{ matrix.prefer-lowest }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ runner.os }}-${{ matrix.php-version }}${{ matrix.prefer-lowest }}-composer-
+
+      - name: Install dependencies
+        run: composer update --prefer-dist ${{ matrix.prefer-lowest }}
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Run phpunit
+        run: vendor/bin/phpunit --coverage-clover build/logs/clover.xml -v
+        env:
+          S3_KEY: ${{ secrets.S3_KEY }}
+          S3_SECRET: ${{ secrets.S3_SECRET }}
+          S3_REGION: ${{ secrets.S3_REGION }}
+          S3_BUCKET: ${{ secrets.S3_BUCKET }}
+
+      - name: Upload coverage results to Coveralls
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          COVERALLS_PARALLEL: true
+          COVERALLS_FLAG_NAME: PHP ${{ matrix.php-versions }} ${{ matrix.prefer-lowest }}
+        run: vendor/bin/php-coveralls --coverage_clover=build/logs/clover.xml
+
+  finish-coverage:
+    needs: phpunit
+    runs-on: ubuntu-latest
+    steps:
+      - name: Coveralls Finished
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          parallel-finished: true

.travis.yml

@@ -21,13 +21,13 @@
         "guzzlehttp/guzzle": "^6.5|^7.1"
     },
     "require-dev": {
-        "orchestra/testbench": "^4.0|^5.0|^6.0",
-        "phpunit/phpunit": "^8.2.4|^9.0",
+        "orchestra/testbench": "^5.9|^6.6",
+        "phpunit/phpunit": "^9.5",
         "vlucas/phpdotenv": "^4.0|^5.0",
         "league/flysystem-aws-s3-v3" : "^1.0.23",
         "guzzlehttp/promises": "^1.3",
         "aws/aws-sdk-php": "^3.128.0",
-        "php-coveralls/php-coveralls": "^2.1",
+        "php-coveralls/php-coveralls": "^2.4",
         "laravel/legacy-factories": "^1.0.4",
         "doctrine/dbal": "^2.11"
     },

composer.json

@@ -93,7 +93,7 @@ public function createImageVariant(
         $manipulation = $this->getVariantDefinition($variantName);
 
         $outputFormat = $this->determineOutputFormat($manipulation, $media);
-        $image = $this->imageManager->make($media->stream());
+        $image = $this->imageManager->make($media->contents());
 
         $callback = $manipulation->getCallback();
         $callback($image);

src/ImageManipulator.php

@@ -138,7 +138,10 @@ private function getHeader($key, $default = null): ?string
      */
     public function getHeaders(): array
     {
-        $headers = @get_headers($this->source, 1);
+        $headers = @get_headers(
+            $this->source,
+            version_compare(phpversion(), '8.0.0', '>=') ? true : 1
+        );
 
         return $headers ?: [];
     }