Integrate travis #1 (#7)

* Integrate travis

* Integrate travis

Integrate travis #1

* Update readme.md

Update readme.md by adding build status

* Apply fixes from StyleCI (#6)

.travis.yml

@@ -0,0 +1,15 @@
+language: php
+
+install:
+  composer install --no-interaction
+
+php:
+  - 7.1
+  - 7.2
+
+cache:
+  directories:
+    - vendor
+
+script:
+  - php vendor/bin/phpunit

config/hashid.php

@@ -14,5 +14,5 @@
          */
 
         'length' => env('HASHID_LENGTH', 6),
-    ]
+    ],
 ];

readme.md

@@ -1,4 +1,4 @@
-# Eloquent Hashid
+# Eloquent Hashid [![Build Status](https://travis-ci.org/erashdan/hashid.svg?branch=master)](https://travis-ci.org/erashdan/hashid)
 
 * [Installation](#installation)
 * [Usage](#usage)

src/HashData.php

@@ -7,7 +7,7 @@
 class HashData
 {
     /**
-     * Encode ID
+     * Encode ID.
      *
      * @param $key
      * @param null $baseKey
@@ -21,9 +21,8 @@ public static function Encode($key, $baseKey)
         return $hashids->encode($key);
     }
 
-
     /**
-     * Decode ID
+     * Decode ID.
      *
      * @param $key
      * @param null $baseKey
@@ -32,29 +31,31 @@ public static function Encode($key, $baseKey)
      */
     public static function Decode($key, $baseKey = null)
     {
-        if (!$baseKey)
+        if (! $baseKey) {
             $baseKey = self::getKey();
+        }
 
         $hashids = new Hashids($baseKey, self::getLength());
+
         return $hashids->decode($key);
     }
 
     /**
-     * Get length
+     * Get length.
      *
      * @throws \Exception
-     * @return integer
+     * @return int
      */
     private static function getLength(): int
     {
         if (
             (config('hashid.hash_data.length') == null) ||
             (config('hashid.hash_data.length') == '') ||
-            !is_int(config('hashid.hash_data.length'))
+            ! is_int(config('hashid.hash_data.length'))
         ) {
             throw new \Exception('Unable to define hashing length');
         }
 
         return config('hashid.hash_data.length');
     }
-}
+}

src/HashidServiceProvider.php

@@ -25,6 +25,5 @@ public function boot()
      */
     public function register()
     {
-
     }
 }

src/Traits/Hashid.php

@@ -8,19 +8,20 @@
 trait Hashid
 {
     /**
-     * Encode hashed id
+     * Encode hashed id.
      *
      * @return mixed
      * @throws \Exception
      */
     public function getHashedIdAttribute()
     {
         $primary = $this->primaryKey;
+
         return HashData::Encode($this->$primary, self::setHashKey(self::class), 20);
     }
 
     /**
-     * Decode hash id
+     * Decode hash id.
      *
      * @param $id
      * @return |null
@@ -33,8 +34,6 @@ public static function DecodeId($id)
         if (count($decode) > 0) {
             return $decode[0];
         }
-
-        return null;
     }
 
     public function scopeFindOrFailHashed($query, $id)
@@ -49,7 +48,7 @@ public function scopeFindOrFailHashed($query, $id)
     public function scopeFindHashed($query, $id)
     {
         if (empty($decoded = self::DecodeId($id))) {
-            return null;
+            return;
         }
 
         return $query->find(self::DecodeId($id));
@@ -61,6 +60,7 @@ public function scopeWhereInHashed($query, $values)
         foreach ($values as $value) {
             $hash[] = self::DecodeId($value);
         }
+
         return $query->whereIn($this->primaryKey, $hash);
     }
 
@@ -73,6 +73,6 @@ private static function setHashKey($class)
             throw new \Exception('Unable to define hashing key');
         }
 
-        return config('hashid.hash_data.key') . $class;
+        return config('hashid.hash_data.key').$class;
     }
-}
+}

tests/HashingTest.php

@@ -6,14 +6,12 @@
 
 class HashingTest extends TestCase
 {
-
     /** @test * */
     public function hashid_can_hash_primary_key()
     {
         $this->assertEquals('N5zQE4', $this->testModel->hashed_id);
     }
 
-
     /** @test * */
     public function get_correct_element_by_hashed_id()
     {
@@ -61,6 +59,5 @@ public function throw_exception_if_hash_length_not_integer()
         config(['hashid.hash_data.length' => 'STRING']);
         $this->expectExceptionMessage('Unable to define hashing length');
         $this->assertNotNull($this->testModel->hashed_id);
-
     }
 }

tests/TestCase.php

@@ -22,7 +22,6 @@ public function setUp()
         config(['hashid.hash_data.length' => 6]);
     }
 
-
     /**
      * Set up the environment.
      *
@@ -36,7 +35,6 @@ protected function getEnvironmentSetUp($app)
             'database' => ':memory:',
             'prefix'   => '',
         ]);
-
     }
 
     /**
@@ -55,5 +53,4 @@ protected function setUpDatabase($app)
 
         TestModel::create(['another_key' => 2]);
     }
-
 }

tests/TestModel.php

@@ -12,4 +12,4 @@ class TestModel extends Model
     protected $fillable = ['another_key'];
 
     public $timestamps = false;
-}
+}