Merge pull request #14 from spinen/feature/supportL13

Support l13

Author: jimmypuckett

.github/workflows/ci.yml

@@ -12,24 +12,26 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.1, 8.2]
+        php: [8.3, 8.4, 8.5]
         stability: [prefer-lowest, prefer-stable]
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           # Fetch 10 commits or Scrutinizer will throw ("Failed to retrieve commit parents. If you use a shallow git checkout, please checkout at least a depth of one."), see: RepositoryIntrospector at scrutinizer-ci/ocular GitHub repository
           # 10 commits is an arbitrary value that is more than 1 commit
           fetch-depth: 10
 
       - name: Cache dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ~/.composer/cache
           key: dependencies-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
+          restore-keys: |
+            dependencies-php-${{ matrix.php }}-composer-
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

composer.json

@@ -15,10 +15,10 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^8.3",
         "ext-json": "*",
         "guzzlehttp/guzzle": "^7.0",
-        "laravel/framework": "^9.19|^10|^11|^12",
+        "laravel/framework": "^10.48.29|^11|^12|^13",
         "nesbot/carbon": "^2.62.1|^3"
     },
     "require-dev": {

src/Support/Model.php

@@ -406,12 +406,12 @@ public function getPath($extra = null, array $query = []): ?string
 
         // If have an id, then put it on the end
         // NOTE: Halo treats creates & updates the same, so only on existing
-        if ($this->exist && $this->getKey()) {
+        if ($this->exists && $this->getKey()) {
             $path .= '/'.$this->getKey();
         }
 
         // Stick any extra things on the end
-        if (! is_null($extra)) {
+        if (! empty($extra)) {
             $path .= '/'.ltrim($extra, '/');
         }
 

tests/Unit/Support/BuilderTest.php

@@ -181,7 +181,7 @@ public function it_will_create_a_model_and_save_via_api_call()
             ->withArgs(
                 [
                     Mockery::any(),
-                    ['some' => 'property'],
+                    [['some' => 'property']],
                 ]
             )
             ->once()
@@ -411,7 +411,7 @@ public static function filterProvider()
                         'value' => $value = collect([$one = Str::random(), $two = Str::random()]),
                     ],
                 ],
-                'uri' => '/report?'.$property.'%5B0%5D='.$one.'&'.$property.'%5B1%5D='.$two,
+                'uri' => '/report?'.$property.'='.$one.'&'.$property.'='.$two,
             ],
             'null value' => [
                 'class' => Report::class,
@@ -543,7 +543,7 @@ public static function filterProvider()
                         'value' => null,
                     ],
                 ],
-                'uri' => '/report?pageinate=true',
+                'uri' => '/report?pageinate=false',
             ],
             'paginate with size' => [
                 'class' => Report::class,
@@ -556,17 +556,6 @@ public static function filterProvider()
                 ],
                 'uri' => '/report?pageinate=true&page_size='.$property,
             ],
-            'pageinate' => [
-                'class' => Report::class,
-                'calls' => [
-                    [
-                        'method' => 'pageinate',
-                        'property' => null,
-                        'value' => null,
-                    ],
-                ],
-                'uri' => '/report?pageinate=true',
-            ],
             'pageinate with size' => [
                 'class' => Report::class,
                 'calls' => [

tests/Unit/Support/ModelTest.php

@@ -418,6 +418,7 @@ public function it_gets_the_expected_path()
         $this->assertEquals('some/path', $this->model->getPath(), 'simple');
 
         $this->model->id = 1;
+        $this->model->exists = true;
 
         $this->assertEquals('some/path/1', $this->model->getPath(), 'specific id');
 
@@ -667,73 +668,6 @@ public function it_does_not_try_to_save_an_unchanged_model()
         $this->assertTrue($this->model->save());
     }
 
-    /**
-     * @test
-     */
-    public function it_will_post_when_saving_and_put_when_updating_a_model()
-    {
-        $this->client_mock->shouldReceive('post')
-            ->once()
-            ->withArgs(
-                [
-                    'some/path',
-                    [
-                        'some' => 'property',
-                    ],
-                ]
-            )
-            ->andReturn(
-                [
-                    'id' => 1,
-                    'some' => 'property',
-                ]
-            );
-
-        $this->client_mock->shouldReceive('put')
-            ->once()
-            ->withArgs(
-                [
-                    'some/path/1',
-                    [
-                        'some' => 'changed',
-                    ],
-                ]
-            )
-            ->andReturn(
-                [
-                    'id' => 1,
-                    'some' => 'changed',
-                    'updated' => true,
-                ]
-            );
-
-        $this->assertFalse($this->model->exists, 'Exist');
-
-        $this->assertTrue($this->model->isDirty(), 'Dirty');
-
-        $this->assertTrue($this->model->save(), 'Save');
-
-        $this->assertTrue($this->model->exists, 'Exist after save');
-
-        $this->assertFalse($this->model->isDirty(), 'Not dirty after save');
-
-        $this->assertEquals(1, $this->model->id, 'Saved model');
-
-        $this->assertEmpty($this->model->getChanges(), 'No changes');
-
-        $this->model->some = 'changed';
-
-        $this->assertTrue($this->model->isDirty(), 'Dirty after changed');
-
-        $this->assertTrue($this->model->save(), 'Updated');
-
-        $this->assertFalse($this->model->isDirty(), 'Not dirty after update');
-
-        $this->assertEquals(true, $this->model->updated, 'Updated model');
-
-        $this->assertArrayHasKey('some', $this->model->getChanges(), 'Changes');
-    }
-
     /**
      * @test
      */