From dc882fffd8786aa2e0b4c911309bdc0622a827b5 Mon Sep 17 00:00:00 2001
From: Djamil Legato <djamil@djamil.it>
Date: Mon, 29 Aug 2016 23:23:21 -0700
Subject: [PATCH] Cleanup

---
 system/config/system.yaml                              | 2 +-
 system/src/Grav/Common/Assets.php                      | 2 +-
 system/src/Grav/Common/Markdown/ParsedownGravTrait.php | 2 +-
 system/src/Grav/Common/Page/Page.php                   | 1 -
 system/src/Grav/Common/Page/Pages.php                  | 2 +-
 system/src/Grav/Console/Gpm/IndexCommand.php           | 1 -
 system/src/Grav/Console/Gpm/UpdateCommand.php          | 2 +-
 7 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/system/config/system.yaml b/system/config/system.yaml
index e7a79b52e..1d688bf7a 100644
--- a/system/config/system.yaml
+++ b/system/config/system.yaml
@@ -129,4 +129,4 @@ gpm:
   releases: stable                           # Set to either 'stable' or 'testing'
   proxy_url:                                 # Configure a manual proxy URL for GPM (eg 127.0.0.1:3128)
 
-custom_base_url: ''
\ No newline at end of file
+custom_base_url: ''
diff --git a/system/src/Grav/Common/Assets.php b/system/src/Grav/Common/Assets.php
index c199ca463..014112531 100644
--- a/system/src/Grav/Common/Assets.php
+++ b/system/src/Grav/Common/Assets.php
@@ -1349,7 +1349,7 @@ class Assets
     public function getTimestamp($asset = null)
     {
         if (is_array($asset)) {
-            if ($asset['remote'] == false) {
+            if ($asset['remote'] === false) {
                 if (Utils::contains($asset['asset'], '?')) {
                     return str_replace('?', '&', $this->timestamp);
                 } else {
diff --git a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
index 9b491c22c..19b710386 100644
--- a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
+++ b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
@@ -151,7 +151,7 @@ trait ParsedownGravTrait
      *
      * @return $this
      */
-    function setSpecialChars($special_chars)
+    public function setSpecialChars($special_chars)
     {
         $this->special_chars = $special_chars;
 
diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php
index 118e41331..ba360a19a 100644
--- a/system/src/Grav/Common/Page/Page.php
+++ b/system/src/Grav/Common/Page/Page.php
@@ -2369,7 +2369,6 @@ class Page
                 // safety check in case page is not found
                 if (!isset($page)) {
                     return $results;
-                    return $results;
                 }
 
                 // Handle a @page.descendants
diff --git a/system/src/Grav/Common/Page/Pages.php b/system/src/Grav/Common/Page/Pages.php
index b2fb063eb..1fab5e597 100644
--- a/system/src/Grav/Common/Page/Pages.php
+++ b/system/src/Grav/Common/Page/Pages.php
@@ -851,7 +851,7 @@ class Pages
 
         $page_extension = '';
 
-        if ($pages_found and count($pages_found) > 0) {
+        if ($pages_found && count($pages_found) > 0) {
 
             $page_extensions = $language->getFallbackPageExtensions();
 
diff --git a/system/src/Grav/Console/Gpm/IndexCommand.php b/system/src/Grav/Console/Gpm/IndexCommand.php
index 70fbbee5d..851b37e83 100644
--- a/system/src/Grav/Console/Gpm/IndexCommand.php
+++ b/system/src/Grav/Console/Gpm/IndexCommand.php
@@ -176,7 +176,6 @@ class IndexCommand extends ConsoleCommand
     {
         $package   = isset($list[$package->slug]) ? $list[$package->slug] : $package;
         $type      = ucfirst(preg_replace("/s$/", '', $package->package_type));
-        $updatable = $this->gpm->{'is' . $type . 'Updatable'}($package->slug);
         $installed = $this->gpm->{'is' . $type . 'Installed'}($package->slug);
 
         return !$installed ? '<magenta>not installed</magenta>' : '<cyan>installed</cyan>';
diff --git a/system/src/Grav/Console/Gpm/UpdateCommand.php b/system/src/Grav/Console/Gpm/UpdateCommand.php
index 66b17a10a..6428e90a0 100644
--- a/system/src/Grav/Console/Gpm/UpdateCommand.php
+++ b/system/src/Grav/Console/Gpm/UpdateCommand.php
@@ -122,7 +122,7 @@ class UpdateCommand extends ConsoleCommand
             $this->output->writeln("<red>ERROR</red>: " . Installer::lastErrorMsg());
             exit;
         }
-        if ($this->input->getOption('plugins') === false and $this->input->getOption('themes') === false) {
+        if ($this->input->getOption('plugins') === false && $this->input->getOption('themes') === false) {
             $list_type = ['plugins' => true, 'themes' => true];
         } else {
             $list_type['plugins'] = $this->input->getOption('plugins');