Skip to content

Update package to Laravel 9 compatibility #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 19 commits into
base: develop
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .phpunit.result.cache
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"version":1,"defects":{"BasicFieldsTest::testTextFieldValue":4,"BasicFieldsTest::testTextareaFieldValue":4,"BasicFieldsTest::testNumberFieldValue":4,"BasicFieldsTest::testEmailFieldValue":4,"BasicFieldsTest::testUrlFieldValue":4,"BasicFieldsTest::testPasswordFieldValue":4,"ChoicesFieldsTest::testSelectField":4,"ChoicesFieldsTest::testSelectMultipleField":4,"ChoicesFieldsTest::testCheckboxField":4,"ChoicesFieldsTest::testRadioField":4,"ChoicesFieldsTest::testTrueFalseField":4,"ContentFieldsTest::testEditorFieldValue":4,"ContentFieldsTest::testOembedFieldValue":4,"ContentFieldsTest::testImageFieldValue":4,"ContentFieldsTest::testFileFieldValue":4,"ContentFieldsTest::testGalleryFieldValue":4,"CorcelIntegrationTest::testIfCorcelIntegrationIsWorking":4,"CorcelIntegrationTest::testUsageOfHelperFunctions":4,"CorcelIntegrationTest::testFunctionHelperWithSnakeCaseFieldType":4,"EmptyBasicFieldsTest::testTextFieldValue":4,"EmptyBasicFieldsTest::testTextareaFieldValue":4,"EmptyBasicFieldsTest::testNumberFieldValue":4,"EmptyBasicFieldsTest::testEmailFieldValue":4,"EmptyBasicFieldsTest::testUrlFieldValue":4,"EmptyBasicFieldsTest::testPasswordFieldValue":4,"FieldFactoryTest::testInvalidFieldName":4,"FieldFactoryTest::testTextField":4,"FieldFactoryTest::testTextareaField":4,"FieldFactoryTest::testNumberField":4,"FieldFactoryTest::testEmailField":4,"FieldFactoryTest::testUrlField":4,"FieldFactoryTest::testPasswordField":4,"FieldFactoryTest::testEditorField":4,"FieldFactoryTest::testOembedField":4,"FieldFactoryTest::testImageField":4,"JqueryFieldsTests::testGoogleMapField":1,"JqueryFieldsTests::testDatePickerField":4,"JqueryFieldsTests::testDateTimePickerField":4,"JqueryFieldsTests::testTimePickerField":4,"JqueryFieldsTests::testColorPickerField":4,"LayoutFieldsTest::testRepeaterField":4,"LayoutFieldsTest::testComplexRepeaterField":4,"LayoutFieldsTest::testFlexibleContentField":4,"RelationalFieldsTests::testPostObjectField":4,"RelationalFieldsTests::testPageLinkField":4,"RelationalFieldsTests::testRelationshipField":4,"RelationalFieldsTests::testTaxonomyField":4,"RelationalFieldsTests::testUserField":4},"times":{"BasicFieldsTest::testTextFieldValue":0.08,"BasicFieldsTest::testTextareaFieldValue":0.002,"BasicFieldsTest::testNumberFieldValue":0.001,"BasicFieldsTest::testEmailFieldValue":0.001,"BasicFieldsTest::testUrlFieldValue":0.001,"BasicFieldsTest::testPasswordFieldValue":0.001,"ChoicesFieldsTest::testSelectField":0.001,"ChoicesFieldsTest::testSelectMultipleField":0.001,"ChoicesFieldsTest::testCheckboxField":0.001,"ChoicesFieldsTest::testRadioField":0.001,"ChoicesFieldsTest::testTrueFalseField":0.002,"ContentFieldsTest::testEditorFieldValue":0.001,"ContentFieldsTest::testOembedFieldValue":0.001,"ContentFieldsTest::testImageFieldValue":0.004,"ContentFieldsTest::testFileFieldValue":0.003,"ContentFieldsTest::testGalleryFieldValue":0.004,"CorcelIntegrationTest::testIfCorcelIntegrationIsWorking":0.011,"CorcelIntegrationTest::testUsageOfHelperFunctions":0.002,"CorcelIntegrationTest::testFunctionHelperWithSnakeCaseFieldType":0.019,"EmptyBasicFieldsTest::testTextFieldValue":0.002,"EmptyBasicFieldsTest::testTextareaFieldValue":0.001,"EmptyBasicFieldsTest::testNumberFieldValue":0.001,"EmptyBasicFieldsTest::testEmailFieldValue":0.001,"EmptyBasicFieldsTest::testUrlFieldValue":0.001,"EmptyBasicFieldsTest::testPasswordFieldValue":0.001,"FieldFactoryTest::testInvalidFieldName":0.002,"FieldFactoryTest::testTextField":0.003,"FieldFactoryTest::testTextareaField":0.003,"FieldFactoryTest::testNumberField":0.003,"FieldFactoryTest::testEmailField":0.003,"FieldFactoryTest::testUrlField":0.002,"FieldFactoryTest::testPasswordField":0.002,"FieldFactoryTest::testEditorField":0.002,"FieldFactoryTest::testOembedField":0.002,"FieldFactoryTest::testImageField":0.003,"JqueryFieldsTests::testGoogleMapField":0.002,"JqueryFieldsTests::testDatePickerField":0.001,"JqueryFieldsTests::testDateTimePickerField":0.001,"JqueryFieldsTests::testTimePickerField":0.001,"JqueryFieldsTests::testColorPickerField":0.001,"LayoutFieldsTest::testRepeaterField":0.005,"LayoutFieldsTest::testComplexRepeaterField":0.011,"LayoutFieldsTest::testFlexibleContentField":0.005,"RelationalFieldsTests::testPostObjectField":0.001,"RelationalFieldsTests::testPageLinkField":0.002,"RelationalFieldsTests::testRelationshipField":0.001,"RelationalFieldsTests::testTaxonomyField":0.002,"RelationalFieldsTests::testUserField":0.001}}
36 changes: 28 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,43 @@
language: php
php:
- '7.2'
- '7.3'

matrix:
include:
- php: 7.2
env: CORCEL='^4.0'
- php: 7.3
env: CORCEL='^4.0'
- php: 7.3
env: CORCEL='^5.0'
- php: 7.4
env: CORCEL='^4.0'
- php: 7.4
env: CORCEL='^5.0'
- php: 8.0.2
env: CORCEL='^6.0'

dist: trusty
sudo: required

addons:
apt:
packages:
- unzip
- mysql-server-5.6
- mysql-client-core-5.6
- mysql-client-5.6
before_install:

before_script:
- unzip tests/config/database.sql.zip -d tests/config/
- mysql -u root -e "create database corcel_acf;"
- mysql -u root corcel_acf < tests/config/database.sql
before_script:

before_install:
- rm composer.lock
- composer self-update
- composer install
- composer require jgrossi/corcel:$CORCEL --no-interaction --no-update

install:
- composer install --prefer-dist --no-interaction --no-suggest

script:
- mkdir -p build/logs
- ./vendor/bin/phpunit
- ./vendor/bin/phpunit
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -12,10 +12,10 @@
],
"require": {
"php": ">=7.2",
"jgrossi/corcel": "^3.0"
"jgrossi/corcel": "^4.0|^5.0|^6.0"
},
"require-dev": {
"phpunit/phpunit": "^8.0"
"phpunit/phpunit": "^8.4|^9.0"
},
"autoload": {
"psr-4": {
2,903 changes: 2,244 additions & 659 deletions composer.lock

Large diffs are not rendered by default.

42 changes: 17 additions & 25 deletions phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,27 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit backupGlobals="false"
backupStaticAttributes="false"
bootstrap="tests/config/bootstrap.php"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false">
<testsuites>
<testsuite name="Corcel ACF Plugin Test Suite">
<directory>./tests/</directory>
</testsuite>
</testsuites>
<filter>
<whitelist>
<directory suffix=".php">app/</directory>
</whitelist>
</filter>
<php>
<env name="APP_ENV" value="testing"/>
<env name="CACHE_DRIVER" value="array"/>
<env name="SESSION_DRIVER" value="array"/>
<env name="QUEUE_DRIVER" value="sync"/>
</php>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="tests/config/bootstrap.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
<coverage>
<include>
<directory suffix=".php">app/</directory>
</include>
</coverage>
<testsuites>
<testsuite name="Corcel ACF Plugin Test Suite">
<directory>./tests/</directory>
</testsuite>
</testsuites>
<php>
<env name="APP_ENV" value="testing"/>
<env name="CACHE_DRIVER" value="array"/>
<env name="SESSION_DRIVER" value="array"/>
<env name="QUEUE_DRIVER" value="sync"/>
</php>
</phpunit>
8 changes: 8 additions & 0 deletions readme.md
Original file line number Diff line number Diff line change
@@ -19,6 +19,14 @@ For more information about how Corcel works please visit [the repository](http:/
- [Running Tests](#running-tests)
* [Licence](#licence)

# Version Compatibility

Corcel | Laravel | PHP
:----------|:---------|:----------
`^4.0` | 7.x | `>=7.2`
`^5.0` | 8.x | `>=7.3`
`^6.0` | 8.x | `>=8.0.2`

# Installation

To install the ACF plugin for Corcel is easy:
3 changes: 2 additions & 1 deletion src/Field/BasicField.php
Original file line number Diff line number Diff line change
@@ -82,7 +82,8 @@ public function __construct(Model $post)
public function fetchValue($field)
{
$postMeta = $this->postMeta->where(
$this->getKeyName(), $this->post->getKey()
$this->getKeyName(),
$this->post->getKey()
)->where('meta_key', $field)->first();

if (isset($postMeta->meta_value) and ! is_null($postMeta->meta_value)) {