phpsrbija / unfinished

src/Core/Middleware/AdminAuth.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
         if (!$user) {
             return $response->withStatus(302)->withHeader(
                 'Location',
-                $this->router->generateUri('auth', ['action' => 'login'])
+                $this->router->generateUri('auth', [ 'action' => 'login' ])
             );
         }
 

src/Core/Service/AdminUserService.php

Unused Use Statements -2 removed lines

@@ -9,8 +9,6 @@
 use Core\Mapper\AdminUsersMapper;
 use Core\Filter\AdminUserFilter;
 use Core\Exception\FilterException;
-use Zend\Db\TableGateway\TableGateway;
-use Zend\Db\Sql\Predicate\Expression;
 use Zend\Paginator\Adapter\DbSelect;
 use Zend\Paginator\Paginator;
 use Zend\Crypt\Password\Bcrypt;

Spacing +21 added lines, -21 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Core\Service;
 
@@ -61,17 +61,17 @@ 
      */
     public function loginUser($email, $password)
     {
-        if(!$email || !$password) {
+        if (!$email || !$password) {
             throw new \Exception('Both email and password are required.', 400);
         }
 
         $user = $this->adminUsersMapper->getByEmail($email);
 
-        if(!$user) {
+        if (!$user) {
             throw new \Exception('User does not exist.');
         }
 
-        if(!$this->crypt->verify($password, $user->password)) {
+        if (!$this->crypt->verify($password, $user->password)) {
             throw new \Exception('Password does not match.');
         }
 
@@ -117,7 +117,7 @@ 
     {
         $filter = $this->adminUserFilter->getInputFilter()->setData($data);
 
-        if(!$filter->isValid()) {
+        if (!$filter->isValid()) {
             throw new FilterException($filter->getMessages());
         }
 
@@ -126,10 +126,10 @@ 
                 'profile_img' => $this->upload->uploadImage($data, 'profile_img')
             ];
 
-        unset($data['confirm_password']);
-        $data['password']        = $this->crypt->create($data['password']);
-        $data['admin_user_id']   = Uuid::uuid1()->toString();
-        $data['admin_user_uuid'] = (new MysqlUuid($data['admin_user_id']))->toFormat(new Binary);
+        unset($data[ 'confirm_password' ]);
+        $data[ 'password' ]        = $this->crypt->create($data[ 'password' ]);
+        $data[ 'admin_user_id' ]   = Uuid::uuid1()->toString();
+        $data[ 'admin_user_uuid' ] = (new MysqlUuid($data[ 'admin_user_id' ]))->toFormat(new Binary);
 
         return $this->adminUsersMapper->insert($data);
     }
@@ -143,17 +143,17 @@ 
         $filter = $this->adminUserFilter->getInputFilter()->setData($data);
 
         // we dont want to force user to enter the password again
-        if($data['password'] == '') {
+        if ($data[ 'password' ] == '') {
             $filter->remove('password');
             $filter->remove('confirm_password');
         }
 
         // if we want to keep same email
-        if($user->email == $data['email']) {
+        if ($user->email == $data[ 'email' ]) {
             $filter->remove('email');
         }
 
-        if(!$filter->isValid()) {
+        if (!$filter->isValid()) {
             throw new FilterException($filter->getMessages());
         }
 
@@ -163,20 +163,20 @@ 
             ];
 
         // We dont want to force user to re-upload image on edit
-        if(!$data['face_img']) {
-            unset($data['face_img']);
+        if (!$data[ 'face_img' ]) {
+            unset($data[ 'face_img' ]);
         }
 
-        if(!$data['profile_img']) {
-            unset($data['profile_img']);
+        if (!$data[ 'profile_img' ]) {
+            unset($data[ 'profile_img' ]);
         }
 
-        if(isset($data['password'])) {
-            unset($data['confirm_password']);
-            $data['password'] = $this->crypt->create($data['password']);
+        if (isset($data[ 'password' ])) {
+            unset($data[ 'confirm_password' ]);
+            $data[ 'password' ] = $this->crypt->create($data[ 'password' ]);
         }
 
-        return $this->adminUsersMapper->update($data, ['admin_user_id' => $userId]);
+        return $this->adminUsersMapper->update($data, [ 'admin_user_id' => $userId ]);
     }
 
     /**
@@ -187,7 +187,7 @@ 
      */
     public function delete($userId)
     {
-        return (bool)$this->adminUsersMapper->delete(['admin_user_id' => $userId]);
+        return (bool) $this->adminUsersMapper->delete([ 'admin_user_id' => $userId ]);
     }
 
     /**

data/phinx/migrations/20161229132343_discussions.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 use MysqlUuid\Formats\Binary;
 use MysqlUuid\Uuid;
 use Core\Entity\ArticleType;
-use MysqlUuid\Formats\PlainString;
 
 class Discussions extends AbstractMigration
 {

Spacing +8 added lines, -8 removed lines

@@ -10,11 +10,11 @@ 
 {
     public function up()
     {
-        $this->table('article_discussions', ['id' => false])
-            ->addColumn('article_uuid', 'binary', ['limit' => 16])
+        $this->table('article_discussions', [ 'id' => false ])
+            ->addColumn('article_uuid', 'binary', [ 'limit' => 16 ])
             ->addColumn('title', 'text')
             ->addColumn('body', 'text')
-            ->addForeignKey('article_uuid', 'articles', 'article_uuid', ['delete' => 'NO_ACTION', 'update' => 'NO_ACTION'])
+            ->addForeignKey('article_uuid', 'articles', 'article_uuid', [ 'delete' => 'NO_ACTION', 'update' => 'NO_ACTION' ])
             ->create();
 
 //        $this->insertDummyData();
@@ -27,15 +27,15 @@ 
 
     private function insertDummyData()
     {
-        $ids  = [];
+        $ids  = [ ];
         $rows = $this->fetchAll('select admin_user_uuid from admin_users;');
-        foreach($rows as $r){
-            $ids[] = $r['admin_user_uuid'];
+        foreach ($rows as $r) {
+            $ids[ ] = $r[ 'admin_user_uuid' ];
         }
 
         $faker = Faker\Factory::create();
         $count = rand(250, 300);
-        for($i = 0; $i < $count; $i++){
+        for ($i = 0; $i < $count; $i++) {
             $id        = $faker->uuid;
             $mysqluuid = (new Uuid($id))->toFormat(new Binary());
             $title     = $faker->sentence(5, 15);
@@ -45,7 +45,7 @@ 
                 'article_id'      => $id,
                 'slug'            => strtolower(trim(preg_replace('~[^\pL\d]+~u', '-', $title), '-')),
                 'status'          => 1,
-                'admin_user_uuid' => $ids[array_rand($ids)],
+                'admin_user_uuid' => $ids[ array_rand($ids) ],
                 'type'            => ArticleType::DISCUSSION
             ];
 

data/phinx/migrations/20161229132350_events.php

Spacing +16 added lines, -16 removed lines

@@ -10,19 +10,19 @@ 
 {
     public function up()
     {
-        $this->table('article_events', ['id' => false])
-            ->addColumn('article_uuid', 'binary', ['limit' => 16])
+        $this->table('article_events', [ 'id' => false ])
+            ->addColumn('article_uuid', 'binary', [ 'limit' => 16 ])
             ->addColumn('title', 'text')
-            ->addColumn('sub_title', 'text', ['null' => true])
+            ->addColumn('sub_title', 'text', [ 'null' => true ])
             ->addColumn('place_name', 'text')
             ->addColumn('body', 'text')
             ->addColumn('longitude', 'text')
             ->addColumn('latitude', 'text')
-            ->addColumn('featured_img', 'text', ['null' => true])
-            ->addColumn('main_img', 'text', ['null' => true])
+            ->addColumn('featured_img', 'text', [ 'null' => true ])
+            ->addColumn('main_img', 'text', [ 'null' => true ])
             ->addColumn('start_at', 'datetime')
             ->addColumn('end_at', 'datetime')
-            ->addForeignKey('article_uuid', 'articles', 'article_uuid', ['delete' => 'NO_ACTION', 'update' => 'NO_ACTION'])
+            ->addForeignKey('article_uuid', 'articles', 'article_uuid', [ 'delete' => 'NO_ACTION', 'update' => 'NO_ACTION' ])
             ->create();
 
 //        $this->insertDummyData();
@@ -35,10 +35,10 @@ 
 
     private function insertDummyData()
     {
-        $ids  = [];
+        $ids  = [ ];
         $rows = $this->fetchAll('select admin_user_uuid from admin_users;');
-        foreach($rows as $r){
-            $ids[] = $r['admin_user_uuid'];
+        foreach ($rows as $r) {
+            $ids[ ] = $r[ 'admin_user_uuid' ];
         }
 
         $faker  = Faker\Factory::create();
@@ -46,19 +46,19 @@ 
         $count  = rand(25, 300);
 
         // Download N images and set it randomly to the events
-        for($i = 0; $i < 5; $i++){
+        for ($i = 0; $i < 5; $i++) {
             $image       = $faker->image();
             $destination = $upload->getPath(basename($image));
             rename($image, $destination);
-            $mainImg[] = substr($destination, strlen('/var/www/unfinished/public'));
+            $mainImg[ ] = substr($destination, strlen('/var/www/unfinished/public'));
 
             $image       = $faker->image();
             $destination = $upload->getPath(basename($image));
             rename($image, $destination);
-            $featuredImg[] = substr($destination, strlen('/var/www/unfinished/public'));
+            $featuredImg[ ] = substr($destination, strlen('/var/www/unfinished/public'));
         }
 
-        for($i = 0; $i < $count; $i++){
+        for ($i = 0; $i < $count; $i++) {
             $start     = rand(1, 20);
             $id        = $faker->uuid;
             $mysqluuid = (new Uuid($id))->toFormat(new Binary());
@@ -69,7 +69,7 @@ 
                 'article_id'      => $id,
                 'slug'            => strtolower(trim(preg_replace('~[^\pL\d]+~u', '-', $title), '-')),
                 'status'          => 1,
-                'admin_user_uuid' => $ids[array_rand($ids)],
+                'admin_user_uuid' => $ids[ array_rand($ids) ],
                 'type'            => ArticleType::EVENT
             ];
 
@@ -80,8 +80,8 @@ 
                 'longitude'    => $faker->longitude,
                 'latitude'     => $faker->latitude,
                 'place_name'   => $faker->sentence(1),
-                'main_img'     => $mainImg[array_rand($mainImg)],
-                'featured_img' => $featuredImg[array_rand($featuredImg)],
+                'main_img'     => $mainImg[ array_rand($mainImg) ],
+                'featured_img' => $featuredImg[ array_rand($featuredImg) ],
                 'start_at'     => date("Y-m-d H:i:s", strtotime("+$start  day +$start hours")),
                 'end_at'       => date("Y-m-d H:i:s", strtotime("+$start  day +" . ($start + rand(1, 5)) . " hours"))
             ];

public/admin_assets/vendors/bootstrap-wysiwyg/examples/php/upload.php

Indentation +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-	header ( 'Content-type: text/plain');
-	echo "
+    header ( 'Content-type: text/plain');
+    echo "
 		Now see here, you will see the output of the param most 
 		interesting to PHP. \$_POST.
 		
@@ -13,4 +13,4 @@ 
 		
 		print_r(\$_POST);
 	";	
-	print_r($_POST);
\ No newline at end of file
+    print_r($_POST);
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-	header ( 'Content-type: text/plain');
+	header('Content-type: text/plain');
 	echo "
 		Now see here, you will see the output of the param most 
 		interesting to PHP. \$_POST.

public/admin_assets/vendors/jQuery-Smart-Wizard/more_examples/smartwizard2-validation.php

Indentation +3 added lines, -3 removed lines

@@ -155,9 +155,9 @@
 <table align="center" border="0" cellpadding="0" cellspacing="0">

 <tr><td>

 <?

-   if(isset($_REQUEST['issubmit'])){

-      echo "<strong>form is sumbitted</strong>";

-   }

+    if(isset($_REQUEST['issubmit'])){

+        echo "<strong>form is sumbitted</strong>";

+    }

 

 ?>

  

Spacing +1 added lines, -1 removed lines

@@ -155,7 +155,7 @@
 <table align="center" border="0" cellpadding="0" cellspacing="0">

 <tr><td>

 <?

-   if(isset($_REQUEST['issubmit'])){

+   if (isset($_REQUEST[ 'issubmit' ])) {

       echo "<strong>form is sumbitted</strong>";

    }

 

public/admin_assets/vendors/jQuery-Smart-Wizard/more_examples/services/service.php

Indentation +20 added lines, -20 removed lines

@@ -1,26 +1,26 @@ 
 <?

-  $action = $_REQUEST["action"];

-  switch($action){

-      case "1":

+    $action = $_REQUEST["action"];

+    switch($action){

+        case "1":

           getContent();

         break;                     

-      default:

+        default:

         break;

-  }

+    }

 

- function getContent(){

-   //sleep(1); 

-   $step_number = $_REQUEST["step_number"]; 

-   $html = '<h2 class="StepTitle">Step '.$step_number.' Content</h2>';

-   if($step_number == 1){

-      $html .='<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, 

+    function getContent(){

+    //sleep(1); 

+    $step_number = $_REQUEST["step_number"]; 

+    $html = '<h2 class="StepTitle">Step '.$step_number.' Content</h2>';

+    if($step_number == 1){

+        $html .='<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, 

             sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, 

             quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. 

             Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. 

             Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

             </p>';

-   }elseif($step_number == 2){

-      $html .='<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, 

+    }elseif($step_number == 2){

+        $html .='<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, 

             sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, 

             quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. 

             Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. 

@@ -32,8 +32,8 @@ 
             Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. 

             Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

             </p>';

-   }elseif($step_number == 3){

-      $html .='<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, 

+    }elseif($step_number == 3){

+        $html .='<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, 

             sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, 

             quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. 

             Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. 

@@ -51,15 +51,15 @@ 
             Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. 

             Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

             </p>';

-   }else{

-      $html .='<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, 

+    }else{

+        $html .='<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, 

             sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, 

             quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. 

             Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. 

             Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

             </p>';

-   }

-   echo $html;

- }

+    }

+    echo $html;

+    }

 

 ?>
\ No newline at end of file

Spacing +13 added lines, -13 removed lines

@@ -1,6 +1,6 @@ 
 <?

-  $action = $_REQUEST["action"];

-  switch($action){

+  $action = $_REQUEST[ "action" ];

+  switch ($action) {

       case "1":

           getContent();

         break;                     

@@ -8,19 +8,19 @@ 
         break;

   }

 

- function getContent(){

+ function getContent() {

    //sleep(1); 

-   $step_number = $_REQUEST["step_number"]; 

-   $html = '<h2 class="StepTitle">Step '.$step_number.' Content</h2>';

-   if($step_number == 1){

-      $html .='<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, 

+   $step_number = $_REQUEST[ "step_number" ]; 

+   $html = '<h2 class="StepTitle">Step ' . $step_number . ' Content</h2>';

+   if ($step_number == 1) {

+      $html .= '<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, 

             sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, 

             quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. 

             Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. 

             Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

             </p>';

-   }elseif($step_number == 2){

-      $html .='<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, 

+   }elseif ($step_number == 2) {

+      $html .= '<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, 

             sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, 

             quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. 

             Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. 

@@ -32,8 +32,8 @@ 
             Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. 

             Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

             </p>';

-   }elseif($step_number == 3){

-      $html .='<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, 

+   }elseif ($step_number == 3) {

+      $html .= '<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, 

             sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, 

             quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. 

             Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. 

@@ -51,8 +51,8 @@ 
             Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. 

             Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

             </p>';

-   }else{

-      $html .='<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, 

+   } else {

+      $html .= '<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, 

             sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, 

             quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. 

             Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. 

Braces +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
             Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. 

             Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

             </p>';

-   }elseif($step_number == 2){

+   } elseif($step_number == 2){

       $html .='<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, 

             sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, 

             quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. 

@@ -32,7 +32,7 @@ 
             Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. 

             Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

             </p>';

-   }elseif($step_number == 3){

+   } elseif($step_number == 3){

       $html .='<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, 

             sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, 

             quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. 

@@ -51,7 +51,7 @@ 
             Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. 

             Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

             </p>';

-   }else{

+   } else{

       $html .='<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, 

             sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, 

             quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. 

config/container.php

Spacing +4 added lines, -4 removed lines

@@ -3,9 +3,9 @@
 use Zend\ServiceManager\Config;
 use Zend\ServiceManager\ServiceManager;
 
-$config    = require __DIR__ . '/config.php';                                   // Load configuration
-$container = new ServiceManager();                                              // Build container
-(new Config($config['dependencies']))->configureServiceManager($container);
-$container->setService('config', $config);                        // Inject config
+$config    = require __DIR__ . '/config.php'; // Load configuration
+$container = new ServiceManager(); // Build container
+(new Config($config[ 'dependencies' ]))->configureServiceManager($container);
+$container->setService('config', $config); // Inject config
 
 return $container;
\ No newline at end of file

config/autoload/templates.global.php

Spacing +2 added lines, -2 removed lines

@@ -9,8 +9,8 @@
             'error/404'      => 'templates/error/404.phtml',
         ],
         'paths'  => [
-            'layout' => ['templates/layout'],
-            'error'  => ['templates/error'],
+            'layout' => [ 'templates/layout' ],
+            'error'  => [ 'templates/error' ],
         ],
     ],
 ];
\ No newline at end of file