Updated dependencies and tests

Author: robgridley

composer.json

@@ -9,14 +9,15 @@
     ],
     "license": "MIT",
     "require": {
-        "php": ">=7.0.0",
+        "php": ">=7.1.0",
+        "ext-fileinfo": "*",
         "ext-soap": "*",
-        "nesbot/carbon": "^1.20",
+        "nesbot/carbon": "^2.0",
         "doctrine/inflector": "~1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.2",
-        "mockery/mockery": "^0.9.4",
+        "phpunit/phpunit": "^8.5",
+        "mockery/mockery": "^1.3",
         "symfony/var-dumper": "^5.0"
     },
     "autoload": {

tests/KeyCollectionTest.php

@@ -2,10 +2,11 @@
 
 use Pace\Model;
 use Pace\KeyCollection;
+use PHPUnit\Framework\TestCase;
 
-class KeyCollectionTest extends PHPUnit_Framework_TestCase
+class KeyCollectionTest extends TestCase
 {
-    public function tearDown()
+    public function tearDown(): void
     {
         Mockery::close();
     }
@@ -16,7 +17,7 @@ public function testAll()
         $collection = new KeyCollection($model, [1, 2, 3]);
         $model->shouldReceive('read')->times(3)->andReturnSelf();
         $all = $collection->all();
-        $this->assertInternalType('array', $all);
+        $this->assertIsArray($all);
         $this->assertContainsOnlyInstancesOf(Model::class, $all);
     }
 
@@ -66,13 +67,11 @@ public function testLast()
         $this->assertInstanceOf(Model::class, $collection->last());
     }
 
-    /**
-     * @expectedException \OutOfBoundsException
-     */
     public function testGetThrowsOutOfBoundsException()
     {
         $model = Mockery::mock(Model::class);
         $collection = new KeyCollection($model, [1]);
+        $this->expectException(OutOfBoundsException::class);
         $collection->get(2);
     }
 
@@ -102,7 +101,7 @@ public function testJsonSerializable()
         $model->shouldReceive('read')->with(5)->once()->andReturnSelf();
         $array = $collection->jsonSerialize();
         $this->assertInstanceOf('JsonSerializable', $collection);
-        $this->assertInternalType('array', $array);
+        $this->assertIsArray($array);
         $this->assertContainsOnlyInstancesOf('JsonSerializable', $array);
     }
 
@@ -116,23 +115,19 @@ public function testArrayAccess()
         $this->assertInstanceOf(Model::class, $collection[8]);
     }
 
-    /**
-     * @expectedException \RuntimeException
-     */
     public function testImmutableSet()
     {
         $model = Mockery::mock(Model::class);
         $collection = new KeyCollection($model, []);
+        $this->expectException(RuntimeException::class);
         $collection[0] = 1;
     }
 
-    /**
-     * @expectedException \RuntimeException
-     */
     public function testImmutableUnset()
     {
         $model = Mockery::mock(Model::class);
         $collection = new KeyCollection($model, [1]);
+        $this->expectException(RuntimeException::class);
         unset($collection[1]);
     }
 

tests/ModelAttachmentsTest.php

@@ -2,22 +2,21 @@
 
 use Pace\Model;
 use Pace\Client;
+use PHPUnit\Framework\TestCase;
 use Pace\Services\AttachmentService;
 
-class ModelAttachmentsTest extends PHPUnit_Framework_TestCase
+class ModelAttachmentsTest extends TestCase
 {
-    public function tearDown()
+    public function tearDown(): void
     {
         Mockery::close();
     }
 
-    /**
-     * @expectedException \BadMethodCallException
-     */
     public function testGetContentOnlyAvailableOnFileAttachment()
     {
         $client = Mockery::mock(Client::class);
         $model = new Model($client, 'Job');
+        $this->expectException(BadMethodCallException::class);
         $model->getContent();
     }
 

tests/ModelTest.php

@@ -4,20 +4,20 @@
 use Pace\Client;
 use Pace\KeyCollection;
 use Pace\XPath\Builder;
+use PHPUnit\Framework\TestCase;
+use Pace\ModelNotFoundException;
 
-class ModelTest extends PHPUnit_Framework_TestCase
+class ModelTest extends TestCase
 {
-    public function tearDown()
+    public function tearDown(): void
     {
         Mockery::close();
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testCannotBeConstructedWithCamelCase()
     {
         $client = Mockery::mock(Client::class);
+        $this->expectException(InvalidArgumentException::class);
         new Model($client, 'salesPerson');
     }
 
@@ -48,14 +48,12 @@ public function testPrimaryKeysCanBeSpecifiedOrGuessed()
         $this->assertEquals($model->key('foo'), 999);
     }
 
-    /**
-     * @expectedException UnexpectedValueException
-     */
     public function testExceptionIsThrownForEmptyKey()
     {
         $client = Mockery::mock(Client::class);
         $model = new Model($client, 'CSR');
         $model->id = 0;
+        $this->expectException(UnexpectedValueException::class);
         $model->key();
     }
 
@@ -88,14 +86,12 @@ public function testReadOrFail()
         $this->assertInstanceOf(Model::class, $model->readOrFail(5));
     }
 
-    /**
-     * @expectedException Pace\ModelNotFoundException
-     */
     public function testReadOrFailThrowsModelNotFoundException()
     {
         $client = Mockery::mock(Client::class);
         $client->shouldReceive('readObject')->once()->with('SalesPerson', 5)->andReturn(null);
         $model = new Model($client, 'SalesPerson');
+        $this->expectException(ModelNotFoundException::class);
         $model->readOrFail(5);
     }
 
@@ -325,7 +321,9 @@ public function testDuplicateWithNewKey()
         $model = new Model($client, 'ShipVia', $attributes);
         $model->exists = true;
         $model->description = 'Express';
-        $model->duplicate(5002);
+        $newModel = $model->duplicate(5002);
+        $this->assertInstanceOf(Model::class, $newModel);
+        $this->assertEquals(5002, $newModel->id);
     }
 
     public function testMagicBelongsTo()

tests/TypeTest.php

@@ -1,8 +1,9 @@
 <?php
 
 use Pace\Type;
+use PHPUnit\Framework\TestCase;
 
-class TypeTest extends PHPUnit_Framework_TestCase
+class TypeTest extends TestCase
 {
     public function testCamelize()
     {

tests/XPath/BuilderTest.php

@@ -3,19 +3,19 @@
 use Pace\Model;
 use Pace\KeyCollection;
 use Pace\XPath\Builder;
+use PHPUnit\Framework\TestCase;
+use Pace\ModelNotFoundException;
 
-class BuilderTest extends PHPUnit_Framework_TestCase
+class BuilderTest extends TestCase
 {
-    public function tearDown()
+    public function tearDown(): void
     {
         Mockery::close();
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testExceptionIsThrownForInvalidOperator()
     {
+        $this->expectException(InvalidArgumentException::class);
         (new Builder)->filter('@id', '<>', 99);
     }
 
@@ -146,16 +146,14 @@ public function testFirstOrFail()
         $this->assertInstanceOf(Model::class, (new Builder($model))->firstOrFail());
     }
 
-    /**
-     * @expectedException \Pace\ModelNotFoundException
-     */
     public function testFirstOrFailThrowsModelNotFoundException()
     {
         $model = Mockery::mock(Model::class);
         $collection = Mockery::mock(KeyCollection::class);
         $model->shouldReceive('find')->once()->andReturn($collection);
         $model->shouldReceive('getType')->once()->andReturn('Job');
         $collection->shouldReceive('first')->once()->andReturnNull();
+        $this->expectException(ModelNotFoundException::class);
         (new Builder($model))->firstOrFail();
     }
 }