Merge pull request #58 from GetStream/fix/cs

Code Style cleanup

Author: tbarbugli

src/GetStream/StreamLaravel/Eloquent/Activity.php

@@ -1,7 +1,10 @@
-<?php namespace GetStream\StreamLaravel\Eloquent;
+<?php
 
-use \Illuminate\Database\Eloquent\Model;
+namespace GetStream\StreamLaravel\Eloquent;
 
-abstract class Activity extends Model {
+use Illuminate\Database\Eloquent\Model;
+
+abstract class Activity extends Model
+{
     use ActivityTrait;
 }

src/GetStream/StreamLaravel/Eloquent/ActivityTrait.php

@@ -60,7 +60,8 @@ public function activityActorId()
 
     /**
      * The reference to the model instance of the author/owner
-     * @return object \Illuminate\Database\Eloquent\Model instance
+     *
+     * @return string
      */
     public function activityActor()
     {
@@ -80,6 +81,7 @@ public function activityVerb()
 
     /**
      * The activity object for this instance
+     *
      * @return string
      */
     public function activityObject()
@@ -89,6 +91,7 @@ public function activityObject()
 
     /**
      * The activity foreign_id for this instance
+     *
      * @return string
      */
     public function activityForeignId()
@@ -98,6 +101,7 @@ public function activityForeignId()
 
     /**
      * The activity time for this instance
+     *
      * @return string
      */
     public function activityTime()
@@ -107,7 +111,8 @@ public function activityTime()
 
     /**
      * The feeds that should receive a copy of this instance when it's created
-     * @return GetStream\Stream\Feed[]
+     *
+     * @return \GetStream\Stream\Feed[]
      */
     public function activityNotify()
     {
@@ -116,7 +121,8 @@ public function activityNotify()
 
     /**
      * The activity data for this instance
-     * @return array[string]string
+     *
+     * @return array
      */
     public function createActivity()
     {
@@ -147,5 +153,4 @@ public function createActivity()
 
         return $activity;
     }
-
 }

src/GetStream/StreamLaravel/Eloquent/CreateRemoveObserver.php

@@ -1,17 +1,20 @@
-<?php namespace GetStream\StreamLaravel\Eloquent;
+<?php
 
-class CreateRemoveObserver {
+namespace GetStream\StreamLaravel\Eloquent;
 
+use Illuminate\Support\Facades\App;
+
+class CreateRemoveObserver
+{
     public function created($model)
     {
-        $manager = \App::make('feed_manager');
+        $manager = App::make('feed_manager');
         $manager->activityCreated($model);
     }
 
     public function deleting($model)
     {
-        $manager = \App::make('feed_manager');
+        $manager = App::make('feed_manager');
         $manager->activityDeleted($model);
     }
-
 }

src/GetStream/StreamLaravel/Eloquent/Utils.php

@@ -1,17 +1,20 @@
-<?php namespace GetStream\StreamLaravel\Eloquent;
+<?php
 
-use GetStream\StreamLaravel\Exceptions\ModelReferenceException;
+namespace GetStream\StreamLaravel\Eloquent;
 
-class Utils {
+use GetStream\StreamLaravel\Exceptions\ModelReferenceException;
 
+class Utils
+{
     public static function createModelReference($instance)
     {
         $className = get_class($instance);
         $pk = $instance->getKey();
+
         if (empty($pk)) {
             throw new ModelReferenceException("Could not create a reference for instance of class $className", 1);
         }
+
         return "$className:$pk";
     }
-
 }

src/GetStream/StreamLaravel/Enrich.php

@@ -1,21 +1,23 @@
-<?php namespace GetStream\StreamLaravel;
+<?php
 
-use GetStream\StreamLaravel\EnrichedActivity;
-use GetStream\StreamLaravel\Exceptions\MissingDataException;
+namespace GetStream\StreamLaravel;
 
-class Enrich {
+use Carbon\Carbon;
 
-    private $fields = array();
+class Enrich
+{
+    private $fields = [];
+    private $withTrashed;
 
-    public function __construct($fields = array('actor', 'object'), $withTrashed = true)
+    public function __construct($fields = ['actor', 'object'], $withTrashed = true)
     {
         $this->fields = $fields;
         $this->withTrashed = $withTrashed;
     }
 
-    public function fromDb($model, $ids, $with=array())
+    public function fromDb($model, $ids, $with = [])
     {
-        $results = array();
+        $results = [];
         $pkName = (new $model())->getKeyName();
         $query = $model::with($with)->whereIn($pkName, $ids);
         if (in_array('Illuminate\Database\Eloquent\SoftDeletingTrait', class_uses(get_class($model))) && $this->withTrashed) // previous withTrash method deprecated in Laravel 4.2
@@ -29,7 +31,7 @@ public function fromDb($model, $ids, $with=array())
 
     private function collectReferences($activities)
     {
-        $model_references = array();
+        $model_references = [];
         foreach ($activities as $key => $activity) {
             foreach ($activity as $field=>$value) {
                 if ($value === null) {
@@ -46,10 +48,10 @@ private function collectReferences($activities)
 
     private function retrieveObjects($references)
     {
-        $objects = array();
+        $objects = [];
         foreach ($references as $content_type => $content_ids) {
             $content_type_model = new $content_type;
-            $with = array();
+            $with = [];
             if (method_exists($content_type_model, 'activityLazyLoading')) {
                 $with = $content_type_model->activityLazyLoading();
             }
@@ -61,10 +63,11 @@ private function retrieveObjects($references)
 
     private function wrapActivities($activities)
     {
-        $wrappedActivities = array();
-        foreach ($activities as $i => $activity) {
+        $wrappedActivities = [];
+        foreach ($activities as $activity) {
             $wrappedActivities[] = new EnrichedActivity($activity);
         }
+
         return $wrappedActivities;
     }
 
@@ -114,17 +117,16 @@ public function enrichAggregatedActivities($aggregatedActivities)
             return $aggregatedActivities;
         }
 
-        $references = array();
+        $references = [];
         foreach ($aggregatedActivities as $aggregated) {
             $references = array_replace_recursive($references, $this->collectReferences($aggregated['activities']));
         }
 
         $objects = $this->retrieveObjects($references);
         foreach ($aggregatedActivities as $key => $aggregated) {
-            $aggregatedActivities[$key]['updated_at'] = new \Carbon\Carbon($aggregatedActivities[$key]['updated_at']);
+            $aggregatedActivities[$key]['updated_at'] = new Carbon($aggregatedActivities[$key]['updated_at']);
             $this->injectObjects($aggregatedActivities[$key]['activities'], $objects);
         }
         return $aggregatedActivities;
     }
-
 }

src/GetStream/StreamLaravel/EnrichedActivity.php

@@ -1,8 +1,15 @@
-<?php namespace GetStream\StreamLaravel;
+<?php
 
-class EnrichedActivity implements \ArrayAccess, \IteratorAggregate {
-    private $activityData = array();
-    private $notEnrichedData = array();
+namespace GetStream\StreamLaravel;
+
+use ArrayAccess;
+use ArrayIterator;
+use IteratorAggregate;
+
+class EnrichedActivity implements ArrayAccess, IteratorAggregate
+{
+    private $activityData = [];
+    private $notEnrichedData = [];
 
     public function __construct($activityData)
     {
@@ -50,8 +57,8 @@ public function offsetGet($offset)
     }
 
     // Support iteration over private activityData array
-    public function getIterator() {
-        return new \ArrayIterator($this->activityData);
+    public function getIterator()
+    {
+        return new ArrayIterator($this->activityData);
     }
-
 }

src/GetStream/StreamLaravel/Exceptions/MissingDataException.php

@@ -1,4 +1,9 @@
-<?php namespace GetStream\StreamLaravel\Exceptions;
+<?php
 
-class MissingDataException extends \Exception {
+namespace GetStream\StreamLaravel\Exceptions;
+
+use Exception;
+
+class MissingDataException extends Exception
+{
 }

src/GetStream/StreamLaravel/Exceptions/ModelReferenceException.php

@@ -1,4 +1,9 @@
-<?php namespace GetStream\StreamLaravel\Exceptions;
+<?php
 
-class ModelReferenceException extends \Exception {
+namespace GetStream\StreamLaravel\Exceptions;
+
+use Exception;
+
+class ModelReferenceException extends Exception
+{
 }

src/GetStream/StreamLaravel/Facades/FeedManager.php

@@ -1,14 +1,18 @@
-<?php namespace GetStream\StreamLaravel\Facades;
+<?php
 
-use Illuminate\Support\Facades\Facade;
+namespace GetStream\StreamLaravel\Facades;
 
-class FeedManager extends Facade {
+use Illuminate\Support\Facades\Facade;
 
+class FeedManager extends Facade
+{
     /**
      * Get the registered name of the component.
      *
      * @return string
      */
-    protected static function getFacadeAccessor() { return 'feed_manager'; }
-
+    protected static function getFacadeAccessor()
+    {
+        return 'feed_manager';
+    }
 }