Merge pull request #1 from bavix/dev

global upgrade v2.0

Author: rez1dent3

.codeclimate.yml

@@ -0,0 +1,6 @@
+exclude_patterns:
+  - "config/"
+  - "database/"
+  - "docs/"
+  - "resources/"
+  - "tests/"

.scrutinizer.yml

@@ -1,24 +1,27 @@
 build:
-
   environment:
     php:
       version: 7.2
+      pecl_extensions:
+        - memcached
+    memcached: true
 
   nodes:
     analysis:
       project_setup:
         override: true
       tests:
         override:
-        - php-scrutinizer-run
-        -
-          command: 'vendor/bin/phpunit --coverage-clover=some-file'
-          coverage:
-            file: 'some-file'
-            format: 'clover'
+          - php-scrutinizer-run
+          - command: 'vendor/bin/phpunit --dump-xdebug-filter xdebug-filter.php'
+          -
+            command: 'vendor/bin/phpunit --prepend xdebug-filter.php --coverage-clover=some-file'
+            coverage:
+              file: 'some-file'
+              format: 'clover'
 
 filter:
-  excluded_paths: [tests/*, database/*, config/*]
+  excluded_paths: [docs/*, resources/*, tests/*, database/*, config/*]
 
 checks:
 
@@ -38,3 +41,11 @@ checks:
     fix_line_ending: true
     fix_identation_4spaces: true
     fix_doc_comments: true
+
+coding_style:
+  php:
+    spaces:
+      before_parentheses:
+        closure_definition: true
+      other:
+        after_type_cast: false

.travis.yml

@@ -1,15 +1,31 @@
 language: php
 php:
-  - '7.1'
   - '7.2'
   - '7.3'
   - '7.4snapshot'
   - 'nightly'
 
+services:
+  - memcached
+
 matrix:
   allow_failures:
     - php: '7.4snapshot'
     - php: 'nightly'
 
 before_script:
-  - "composer install"
+  - pecl install pcov
+  - phpenv config-rm xdebug.ini || echo "xdebug not available"
+  - bash <(curl -s https://raw.githubusercontent.com/php-cache/cache/master/build/php/7.2/Memcached.sh)
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - if [ $(phpenv version-name) = "7.3" ]; then ./cc-test-reporter before-build; fi
+  - composer install
+
+script:
+  - ./vendor/bin/phpunit --coverage-xml=build/coverage-xml --log-junit=build/phpunit.junit.xml
+  - ./vendor/bin/infection --coverage=build --min-msi=60 -j$(nproc)
+
+after_success:
+  - if [ $(phpenv version-name) = "7.3" ]; then ./cc-test-reporter after-build --coverage-input-type clover --exit-code $TRAVIS_TEST_RESULT; fi
+  - bash <(curl -s https://codecov.io/bash)

README.md

@@ -2,6 +2,7 @@
 [![Code Coverage](https://scrutinizer-ci.com/g/bavix/laravel-settings/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/bavix/laravel-settings/?branch=master)
 [![Build Status](https://scrutinizer-ci.com/g/bavix/laravel-settings/badges/build.png?b=master)](https://scrutinizer-ci.com/g/bavix/laravel-settings/build-status/master)
 [![Code Intelligence Status](https://scrutinizer-ci.com/g/bavix/laravel-settings/badges/code-intelligence.svg?b=master)](https://scrutinizer-ci.com/code-intelligence)
+[![Mutation testing badge](https://badge.stryker-mutator.io/github.com/bavix/laravel-settings/master)](https://packagist.org/packages/bavix/laravel-settings)
 
 [![Package Rank](https://phppackages.org/p/bavix/laravel-settings/badge/rank.svg)](https://packagist.org/packages/bavix/laravel-settings)
 [![Latest Stable Version](https://poser.pugx.org/bavix/laravel-settings/v/stable)](https://packagist.org/packages/bavix/laravel-settings)
@@ -14,10 +15,40 @@ laravel-settings - Keep user settings easy.
 * **Vendor**: bavix
 * **Package**: laravel-settings
 * **Version**: [![Latest Stable Version](https://poser.pugx.org/bavix/laravel-settings/v/stable)](https://packagist.org/packages/bavix/laravel-settings)
-* **PHP Version**: 7.1+ 
+* **PHP Version**: 7.2+ 
 * **Laravel Version**: `5.5`, `5.6`, `5.7`, `5.8`, `6.0`
 * **[Composer](https://getcomposer.org/):** `composer require bavix/laravel-settings`
 
+### Usage
+Add the `HasSettings`, `HasSetSettings`, `HasGetSettings` trait and `Settingable` interface to model.
+```php
+use Bavix\Settings\Traits\HasSettings;
+use Bavix\Settings\Traits\HasSetSettings;
+use Bavix\Settings\Traits\HasGetSettings;
+use Bavix\Settings\Interfaces\Settingable;
+
+class User extends Model implements Settingable
+{
+    use HasGetSettings, HasSetSettings, HasSettings;
+}
+```
+
+Checking user settings.
+
+```php
+$user = User::first();
+$user->getSetting('notify'); // null
+$user->getSettingBool('notify'); // null
+$user->getSettingBool('notify', false); // bool(false)
+```
+
+Let's save the settings.
+
+```php
+(bool)$user->setSettingBool('notify', false); // bool(true)
+$user->getSettingBool('notify', false); // bool(false)
+```
+
 ---
 Supported by
 

composer.json

@@ -22,13 +22,14 @@
     }
   ],
   "require": {
-    "php": "^7.1",
+    "php": "^7.2",
     "illuminate/database": "^5.5|^6.0"
   },
   "require-dev": {
-    "orchestra/testbench": "^3.7",
+    "infection/infection": "^0.14",
+    "orchestra/testbench": "^4.2",
     "phpstan/phpstan": "^0.11",
-    "phpunit/phpunit": "^7.5|^8.2"
+    "phpunit/phpunit": "^8.4"
   },
   "autoload": {
     "psr-4": {

infection.json.dist

@@ -0,0 +1,17 @@
+{
+    "timeout": 10,
+    "source": {
+        "directories": [
+            "src"
+        ]
+    },
+    "logs": {
+        "text": "build/infection.log",
+        "badge": {
+            "branch": "master"
+        }
+    },
+    "mutators": {
+        "@default": true
+    }
+}

src/Interfaces/Settingable.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Bavix\Settings\Interfaces;
+
+use Bavix\Settings\Models\Setting;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+
+/**
+ * Interface Settingable
+ * @package Bavix\Settings\Interfaces
+ * @property-read Setting[]|Collection $settings
+ */
+interface Settingable
+{
+    /**
+     * @return MorphMany
+     */
+    public function settings(): MorphMany;
+}

src/Models/Setting.php

@@ -5,6 +5,13 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
+/**
+ * Class Setting
+ * @package Bavix\Settings\Models
+ * @property string $key
+ * @property string $cast
+ * @property mixed $value
+ */
 class Setting extends Model
 {
 

src/Services/ReadableService.php

@@ -3,7 +3,7 @@
 namespace Bavix\Settings\Services;
 
 use Bavix\Settings\Models\Setting;
-use Illuminate\Database\Eloquent\Model;
+use Bavix\Settings\Interfaces\Settingable as Model;
 
 class ReadableService
 {

src/Services/SettingService.php

@@ -5,7 +5,7 @@
 use Bavix\Settings\Models\Setting;
 use Bavix\Settings\Traits\HasSettings;
 use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Database\Eloquent\Model;
+use Bavix\Settings\Interfaces\Settingable as Model;
 
 class SettingService
 {
@@ -47,13 +47,9 @@ public function delete(Model $model, string $key): bool
             ->getSetting($model, $key);
 
         if ($setting) {
-            /**
-             * @var Collection $collection
-             */
-            $collection = $model->settings;
-            foreach ($collection as $index => $item) {
+            foreach ($model->settings as $index => $item) {
                 if ($item === $setting) {
-                    $collection->forget($index);
+                    $model->settings->forget($index);
                     break;
                 }
             }