Merge pull request #31 from UseMuffin/slug-associated

Slug associated

Author: ADmad

.travis.yml

@@ -4,6 +4,7 @@ php:
   - 5.5
   - 5.6
   - 7.0
+  - 7.1
 
 sudo: false
 
@@ -23,30 +24,24 @@ matrix:
     - php: 7.0
       env: PHPCS=1 DEFAULT=0
 
-    - php: 7.0
-      env: COVERALLS=1 DEFAULT=0 DB=mysql db_dsn='mysql://travis@0.0.0.0/cakephp_test'
-
 before_script:
-  - sh -c "if [ '$COVERALLS' != '1' ]; then phpenv config-rm xdebug.ini; fi"
+  - if [[ $TRAVIS_PHP_VERSION != 7.0 ]]; then phpenv config-rm xdebug.ini; fi
+
+  - if [[ $DB = 'mysql' ]]; then mysql -e 'CREATE DATABASE cakephp_test;'; fi
+  - if [[ $DB = 'pgsql' ]]; then psql -c 'CREATE DATABASE cakephp_test;' -U postgres; fi
 
   - composer self-update
   - composer install --prefer-dist --no-interaction
 
-  - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE cakephp_test;'; fi"
-  - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'CREATE DATABASE cakephp_test;' -U postgres; fi"
-
-  - sh -c "if [ '$PHPCS' = '1' ]; then composer require cakephp/cakephp-codesniffer:dev-master; fi"
-
-  - sh -c "if [ '$COVERALLS' = '1' ]; then composer require --dev satooshi/php-coveralls:dev-master; fi"
-  - sh -c "if [ '$COVERALLS' = '1' ]; then mkdir -p build/logs; fi"
+  - if [[ $PHPCS = 1 ]]; then composer require cakephp/cakephp-codesniffer:"^3.0"; fi
 
 script:
-  - sh -c "if [ '$DEFAULT' = '1' ]; then phpunit; fi"
-
-  - sh -c "if [ '$PHPCS' = '1' ]; then vendor/bin/phpcs -p --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests; fi"
+  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION != 7.0 ]]; then vendor/bin/phpunit; fi
+  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION = 7.0 ]]; then vendor/bin/phpunit --coverage-clover=clover.xml; fi
+  - if [[ $PHPCS = 1 ]]; then vendor/bin/phpcs -n -p --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests; fi
 
-  - sh -c "if [ '$COVERALLS' = '1' ]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover build/logs/clover.xml || true; fi"
-  - sh -c "if [ '$COVERALLS' = '1' ]; then vendor/bin/coveralls -v; fi"
+after_success:
+  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION = 7.0 ]]; then bash <(curl -s https://codecov.io/bash); fi
 
 notifications:
   email: false

README.md

@@ -1,7 +1,7 @@
 # Slug
 
 [![Build Status](https://img.shields.io/travis/UseMuffin/Slug/master.svg?style=flat-square)](https://travis-ci.org/UseMuffin/Slug)
-[![Coverage](https://img.shields.io/coveralls/UseMuffin/Slug/master.svg?style=flat-square)](https://coveralls.io/r/UseMuffin/Slug)
+[![Coverage](https://img.shields.io/codecov/c/github/UseMuffin/Slug/master.svg?style=flat-square)](https://codecov.io/github/UseMuffin/Slug)
 [![Total Downloads](https://img.shields.io/packagist/dt/muffin/slug.svg?style=flat-square)](https://packagist.org/packages/muffin/slug)
 [![License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](LICENSE)
 

composer.json

@@ -35,7 +35,7 @@
     },
     "require-dev": {
         "cakephp/cakephp": "^3.2.7",
-        "phpunit/phpunit": "4.1.*",
+        "phpunit/phpunit": "<6.0",
         "cocur/slugify": "^1.2"
     },
     "autoload": {

src/Model/Behavior/SlugBehavior.php

@@ -46,7 +46,7 @@ class SlugBehavior extends Behavior
      *
      * @var array
      */
-    public $_defaultConfig = [
+    protected $_defaultConfig = [
         'field' => 'slug',
         'displayField' => null,
         'separator' => '-',
@@ -262,7 +262,7 @@ public function slug($entity, $string = null, $separator = '-')
                 if ($entity->errors($field)) {
                     throw new InvalidArgumentException();
                 }
-                $string[] = $entity->get($field);
+                $string[] = $value = Hash::get($entity, $field);
             }
             $string = implode($separator, $string);
         }

tests/TestCase/Model/Behavior/SlugBehaviorTest.php

@@ -157,6 +157,23 @@ public function testSlug()
         $this->assertEquals($expected, $result);
     }
 
+    public function testSlugWithAssociatedTableField()
+    {
+        $Articles = TableRegistry::get('Muffin/Slug.Articles', ['table' => 'slug_articles']);
+        $Authors = TableRegistry::get('Muffin/Slug.Authors', ['table' => 'slug_authors']);
+
+        $Articles->belongsTo('Authors', ['className' => 'Muffin/Slug.Authors']);
+        $Articles->addBehavior('Muffin/Slug.Slug', ['displayField' => ['author.name', 'title']]);
+
+        $data = ['title' => 'foo', 'sub_title' => 'unused'];
+        $article = $Articles->newEntity($data);
+        $article->author = $Authors->get(1);
+
+        $result = $Articles->slug($article);
+        $expected = 'admad-foo';
+        $this->assertEquals($expected, $result);
+    }
+
     public function testBeforeSaveMultiField()
     {
         $Articles = TableRegistry::get('Muffin/Slug.Articles', ['table' => 'slug_articles']);
@@ -266,7 +283,6 @@ public function testMaxLength()
         $this->assertEquals($expected, $result);
     }
 
-
     public function testCustomMaxLength()
     {
         $this->Tags->removeBehavior('Slug');

tests/bootstrap.php

@@ -23,6 +23,7 @@
 chdir($root);
 if (file_exists($root . '/config/bootstrap.php')) {
     require $root . '/config/bootstrap.php';
+
     return;
 }