Merge pull request #2 from pboivin/glide-version

fix: Update glide version constraints

.github/workflows/tests.yml

@@ -14,14 +14,15 @@ jobs:
       fail-fast: false
       matrix:
         php: ['8.0', '8.1']
+        glide: ['1.*', '2.*']
 
-    name: P${{ matrix.php }}
+    name: P${{ matrix.php }} G${{ matrix.glide }}
 
     steps:
     - uses: actions/checkout@v2
 
     - name: Setup PHP, with composer and extensions
-      uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+      uses: shivammathur/setup-php@v2
       with:
         php-version: ${{ matrix.php }}
 
@@ -30,13 +31,14 @@ jobs:
       uses: actions/cache@v2
       with:
         path: vendor
-        key: ${{ runner.os }}-node-${{ hashFiles('**/composer.json') }}
+        key: ${{ runner.os }}-${{ matrix.php }}-${{ matrix.glide }}-composer-${{ hashFiles('**/composer.lock') }}
         restore-keys: |
-          ${{ runner.os }}-node-
+          ${{ runner.os }}-${{ matrix.php }}-${{ matrix.glide }}-composer-
 
     - name: Install dependencies
-      if: steps.composer-cache.outputs.cache-hit != 'true'
-      run: composer install --prefer-dist --no-progress --no-suggest
+      run: |
+        composer require "league/glide:${{ matrix.glide }}" --no-interaction --no-update
+        composer install --prefer-dist --no-interaction --no-plugins
 
     - name: Run test suite
       run: php vendor/bin/phpunit

.gitignore

@@ -2,6 +2,7 @@
 *.swp
 
 /__tmp__
+/tests/fixtures/__cache__
 /vendor
 /composer.lock
 /.php_cs.cache

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Release Notes
 
+## [v1.0.1](https://github.com/pboivin/flou/compare/v1.0.0...v1.0.1) - 2022-08-04
+
+#### Fixed
+
+- Update glide version constraints to allow installation on a wider range of projects
+
+
 ## [v1.0.0](https://github.com/pboivin/flou/compare/v1.0.0-beta...v1.0.0) - 2022-08-01
 
 #### Added

composer.json

@@ -16,7 +16,7 @@
     ],
     "require": {
         "php": ">=8.0",
-        "league/glide": "^2.2"
+        "league/glide": "^1.0|^2.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",

tests/GlideTest.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace Pboivin\Flou\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Pboivin\Flou\ImageFactory;
+
+class GlideTest extends TestCase
+{
+    protected $factory;
+    protected $sourcePath;
+    protected $cachePath;
+    protected $cachedFile;
+
+    protected function setUp(): void
+    {
+        $this->sourcePath = __DIR__ . '/fixtures/source';
+
+        $this->cachePath = __DIR__ . '/fixtures/__cache__';
+
+        $this->factory = new ImageFactory([
+            'sourcePath' => $this->sourcePath,
+            'cachePath' => $this->cachePath,
+            'sourceUrlBase' => '/images/source',
+            'cacheUrlBase' => '/images/cache',
+        ]);
+
+        $this->cleanCacheDirectories();
+    }
+
+    protected function cleanCacheDirectories()
+    {
+        if (file_exists($this->cachePath . '/square.jpg')) {
+            foreach (glob($this->cachePath . '/square.jpg/*') as $file) {
+                unlink($file);
+            }
+
+            rmdir($this->cachePath . '/square.jpg');
+        }
+    }
+
+    public function test_can_transform_source_image()
+    {
+        $this->assertFalse(file_exists($this->cachePath . '/square.jpg'));
+
+        $image = $this->factory->image('square.jpg');
+
+        $this->assertTrue(file_exists($this->cachePath . '/square.jpg'));
+        $this->assertTrue(file_exists($image->cached()->path()));
+    }
+}

tests/ImageFileInspectorTest.php

@@ -14,7 +14,7 @@ public function test_can_inspect_size()
     {
         $inspector = new ImageFileInspector();
 
-        $size = $inspector->getSize(__DIR__ . '/fixtures/square.jpg');
+        $size = $inspector->getSize(__DIR__ . '/fixtures/source/square.jpg');
 
         $this->assertEquals(100, $size['width']);
         $this->assertEquals(100, $size['height']);