Merge pull request #83 from corcel/develop

Update to Corcel 3.0
corcel · Sep 13, 2019 · 813ffb4 · 813ffb4
2 parents 8091c7c + 52eb388
commit 813ffb4
Show file tree

Hide file tree

Showing 13 changed files with 967 additions and 417 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,5 @@
 language: php
 php:
-  - '5.6'
-  - '7.0'
-  - '7.1'
   - '7.2'
   - '7.3'
 dist: trusty

diff --git a/composer.json b/composer.json
@@ -11,11 +11,11 @@
     }
   ],
   "require": {
-    "php": ">=5.5.9",
-    "jgrossi/corcel": "~2.1"
+    "php": ">=7.2",
+    "jgrossi/corcel": "^3.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "~4.8"
+    "phpunit/phpunit": "^8.0"
   },
   "autoload": {
     "psr-4": {

diff --git a/composer.lock b/composer.lock
diff --git a/src/AdvancedCustomFields.php b/src/AdvancedCustomFields.php
@@ -4,6 +4,7 @@
 
 use Corcel\Acf\Exception\MissingFieldNameException;
 use Corcel\Model;
+use Illuminate\Support\Str;
 
 /**
  * Class AdvancedCustomFields.
@@ -53,7 +54,7 @@ public function __call($name, $arguments)
             throw new MissingFieldNameException('The field name is missing');
         }
 
-        $field = FieldFactory::make($arguments[0], $this->post, snake_case($name));
+        $field = FieldFactory::make($arguments[0], $this->post, Str::snake($name));
 
         return $field ? $field->get() : null;
     }

diff --git a/tests/BasicFieldsTest.php b/tests/BasicFieldsTest.php
@@ -8,7 +8,7 @@
  *
  * @author Junior Grossi <juniorgro@gmail.com>
  */
-class BasicFieldsTest extends PHPUnit_Framework_TestCase
+class BasicFieldsTest extends PHPUnit\Framework\TestCase
 {
     /**
      * @var Post
@@ -18,7 +18,7 @@ class BasicFieldsTest extends PHPUnit_Framework_TestCase
     /**
      * Setup a base $this->post object to represent the page with the basic fields.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->post = Post::find(11); // it' a page with the custom fields
     }

diff --git a/tests/ChoicesFieldsTest.php b/tests/ChoicesFieldsTest.php
@@ -9,14 +9,14 @@
  *
  * @author Junior Grossi <juniorgro@gmail.com>
  */
-class ChoicesFieldsTest extends PHPUnit_Framework_TestCase
+class ChoicesFieldsTest extends PHPUnit\Framework\TestCase
 {
     /**
      * @var Post
      */
     protected $post;
 
-    public function setUp()
+    protected function setUp(): void
     {
         $this->post = Post::find(44);
     }

diff --git a/tests/ContentFieldsTest.php b/tests/ContentFieldsTest.php
@@ -11,7 +11,7 @@
  *
  * @author Junior Grossi <juniorgro@gmail.com>
  */
-class ContentFieldsTest extends PHPUnit_Framework_TestCase
+class ContentFieldsTest extends PHPUnit\Framework\TestCase
 {
     /**
      * @var Post
@@ -21,7 +21,7 @@ class ContentFieldsTest extends PHPUnit_Framework_TestCase
     /**
      * Setup a base $this->post object to represent the page with the content fields.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->post = Post::find(21); // it' a page with the custom fields
     }

diff --git a/tests/CorcelIntegrationTest.php b/tests/CorcelIntegrationTest.php
@@ -7,7 +7,7 @@
  *
  * @author Junior Grossi <juniorgro@gmail.com>
  */
-class CorcelIntegrationTest extends PHPUnit_Framework_TestCase
+class CorcelIntegrationTest extends PHPUnit\Framework\TestCase
 {
     public function testIfCorcelIntegrationIsWorking()
     {

diff --git a/tests/EmptyBasicFieldsTest.php b/tests/EmptyBasicFieldsTest.php
@@ -9,7 +9,7 @@
  *
  * @author Junior Grossi <juniorgro@gmail.com>
  */
-class EmptyBasicFieldsTest extends PHPUnit_Framework_TestCase
+class EmptyBasicFieldsTest extends PHPUnit\Framework\TestCase
 {
     /**
      * @var Post
@@ -19,7 +19,7 @@ class EmptyBasicFieldsTest extends PHPUnit_Framework_TestCase
     /**
      * Setup a base $this->post object to represent the page with the basic fields.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->post = Post::find(91); // it' a page with empty custom fields
     }

diff --git a/tests/FieldFactoryTest.php b/tests/FieldFactoryTest.php
@@ -8,7 +8,7 @@
  *
  * @author Junior Grossi <juniorgro@gmail.com>
  */
-class FieldFactoryTest extends PHPUnit_Framework_TestCase
+class FieldFactoryTest extends PHPUnit\Framework\TestCase
 {
     public function testInvalidFieldName()
     {

diff --git a/tests/JqueryFieldsTest.php b/tests/JqueryFieldsTest.php
@@ -4,21 +4,21 @@
 use Corcel\Acf\Field\Text;
 use Corcel\Model\Post;
 
-class JqueryFieldsTests extends PHPUnit_Framework_TestCase
+class JqueryFieldsTests extends PHPUnit\Framework\TestCase
 {
     /**
      * @var Post
      */
     protected $post;
 
-    public function setUp()
+    protected function setUp(): void
     {
         $this->post = Post::find(65);
     }
 
     public function testGoogleMapField()
     {
-        // Google Map field is not working at this moment
+        $this->markTestSkipped('Google Map field i s not working at the moment');
     }
 
     public function testDatePickerField()

diff --git a/tests/LayoutFieldsTest.php b/tests/LayoutFieldsTest.php
@@ -9,7 +9,7 @@
  *
  * @author Junior Grossi <juniorgro@gmail.com>
  */
-class LayoutFieldsTest extends PHPUnit_Framework_TestCase
+class LayoutFieldsTest extends PHPUnit\Framework\TestCase
 {
     public function testRepeaterField()
     {

diff --git a/tests/RelationalFieldsTest.php b/tests/RelationalFieldsTest.php
@@ -11,14 +11,14 @@
  *
  * @author Junior Grossi <juniorgro@gmail.com>
  */
-class RelationalFieldsTests extends PHPUnit_Framework_TestCase
+class RelationalFieldsTests extends PHPUnit\Framework\TestCase
 {
     /**
      * @var Post
      */
     protected $post;
 
-    public function setUp()
+    protected function setUp(): void
     {
         $this->post = Post::find(56);
     }