Updating Dewdrop files with results of dewdrop-sniff; 41 commits squashed.

Dewdrop/ActivityLog/Handler/Event/ManyToManyMessage.php

@@ -163,7 +163,7 @@ private function joinListItems(array $shortcodes)
     {
         if (1 === count($shortcodes)) {
             return current($shortcodes);
-        } else if (2 === count($shortcodes)) {
+        } elseif (2 === count($shortcodes)) {
             return implode(' and ', $shortcodes);
         } else {
             $lastItem = array_pop($shortcodes);

Dewdrop/ActivityLog/Handler/NullHandler.php

@@ -21,12 +21,10 @@ public function setActivityLog(ActivityLog $activityLog)
 
     public function write($summary, $message)
     {
-
     }
 
     public function log($summary, $message)
     {
-
     }
 
     public function getName()

Dewdrop/ActivityLog/Handler/TableHandler.php

@@ -57,7 +57,6 @@ public function __construct(Table $table, ActivityLog $activityLog = null, Infle
 
     public function init()
     {
-
     }
 
     public function getTable()

Dewdrop/Admin/Component/ComponentAbstract.php

@@ -161,7 +161,6 @@ abstract public function init();
      */
     public function preDispatch()
     {
-
     }
 
     /**
@@ -372,7 +371,6 @@ public function getName()
     {
         if (!$this->name) {
             $this->name = $this->env->inflectComponentName(basename($this->getPath()));
-
         }
 
         return $this->name;

Dewdrop/Admin/Env/Wp.php

@@ -295,7 +295,7 @@ function () use ($component) {
 
     /**
      * Registering a component in WordPress means registering a handler
-     * for a hook.  Typically, add_object_page is used, but that implies
+     * for a hook.  Typically, add_menu_page is used, but that implies
      * an entry in the top-level admin menu.  Because we want to support
      * components that don't appear in the menu, we check the display-menu
      * permission here and then use add_submenu_page() with no slug to
@@ -334,15 +334,15 @@ function () use ($component) {
     }
 
     /**
-     * A mock wrapper for WP's add_object_page() function.  Allows calls
+     * A mock wrapper for WP's add_menu_page() function.  Allows calls
      * during testing without error.
      *
      * @return void
      */
     protected function addObjectPage()
     {
-        if (function_exists('add_object_page')) {
-            call_user_func_array('add_object_page', func_get_args());
+        if (function_exists('add_menu_page')) {
+            call_user_func_array('add_menu_page', func_get_args());
         }
     }
 

Dewdrop/Admin/Page/PageAbstract.php

@@ -163,7 +163,6 @@ public function shouldProcess()
      */
     public function process(ResponseHelper $response)
     {
-
     }
 
     /**
@@ -173,7 +172,6 @@ public function process(ResponseHelper $response)
      */
     public function render()
     {
-
     }
 
     /**

Dewdrop/Admin/Page/Stock/ImportMapFields.php

@@ -294,13 +294,14 @@ private function getFieldValue($id, $mode, array $importRow)
             case 'value':
                 return $this->request->getPost($id);
             case 'column':
-               $column = $this->request->getPost($id . ':column');
+                $column = $this->request->getPost($id . ':column');
 
                 if (isset($importRow[$column])) {
                     return $importRow[$column];
                 } else {
                     return null;
                 }
+                // break intentionally omitted
             case 'blank':
             default:
                 return null;

Dewdrop/Admin/Page/Stock/NotificationEdit.php

@@ -81,7 +81,6 @@ public function init()
     public function process(ResponseHelper $responseHelper)
     {
         if ($this->request->isPost()) {
-
         }
     }
 

Dewdrop/Admin/Page/Stock/Upload.php

@@ -42,7 +42,7 @@ public function process(ResponseHelper $response)
         if (!$this->request->isPost()) {
             $this->error = 'Upload request must be POST.';
             return;
-        } else if (!count($_FILES)) {
+        } elseif (!count($_FILES)) {
             $this->error = 'No file uploads were present.  Check form encoding or upload_max_filesize.';
             return;
         } else {

Dewdrop/Admin/PageFactory/Custom.php

@@ -8,7 +8,6 @@
  * @license   https://github.com/DeltaSystems/dewdrop/LICENSE
  */
 
-namespace Dewdrop\Admin\Component\ComponentAbstract;
 namespace Dewdrop\Admin\PageFactory;
 
 use Dewdrop\Admin\Component\ComponentAbstract;

Dewdrop/Admin/PageFactory/Files.php

@@ -162,4 +162,3 @@ public function listAvailablePages()
         return $pages;
     }
 }
-

Dewdrop/Bootstrap/Standalone.php

@@ -33,7 +33,6 @@ public function __construct()
 
     public function init()
     {
-
     }
 
     /**

Dewdrop/Cli/Command/Lint.php

@@ -51,6 +51,5 @@ public function init()
      */
     public function execute()
     {
-
     }
 }

Dewdrop/Db/Driver/DriverInterface.php

@@ -297,7 +297,7 @@ public function generateCreateIndexStatement($tableName, array $columnNames);
 
     /**
      * Generate an SQL statement to analyze a table.
-     * 
+     *
      * @param string $tableName
      * @return string
      */

Dewdrop/Db/Driver/Mock.php

@@ -245,15 +245,13 @@ public function describeTable($tableName)
      */
     public function beginTransaction()
     {
-
     }
 
     /**
      * Commit the current transaction.
      */
     public function commit()
     {
-
     }
 
     /**
@@ -263,7 +261,6 @@ public function commit()
      */
     public function rollback()
     {
-
     }
 
     /**
@@ -300,7 +297,6 @@ public function mapNativeTypeToGenericType($nativeType, $length)
      */
     public function prepareSelectForTotalRowCalculation(Select $select)
     {
-
     }
 
     /**
@@ -338,7 +334,6 @@ public function getCaseInsensitiveLikeOperator()
      */
     public function truncateTimeStampToDate($timestamp)
     {
-
     }
 
     /**

Dewdrop/Db/Driver/Wpdb.php

@@ -614,7 +614,7 @@ public function truncateTimeStampToDate($timestamp)
      */
     public function quoteInternal($input)
     {
-        return "'" . $this->wpdb->escape($input) . "'";
+        return "'" . esc_sql($input) . "'";
     }
 
     /**

Dewdrop/Db/Row.php

@@ -153,7 +153,6 @@ public function __construct(Table $table, array $data = array())
      */
     public function init()
     {
-
     }
 
     /**

Dewdrop/Db/Select.php

@@ -996,7 +996,6 @@ protected function tableCols($correlationName, $cols, $afterCorrelationName = nu
         }
 
         if ($columnValues) {
-
             // should we attempt to prepend or insert these values?
             if ($afterCorrelationName === true || is_string($afterCorrelationName)) {
                 $tmpColumns = $this->parts[self::COLUMNS];

Dewdrop/Db/Select/Filter/FilterInterface.php

@@ -26,4 +26,4 @@ interface FilterInterface
      * @return Select
      */
     public function apply(Select $select, $conditionSetName, array $queryVars);
-}
+}

Dewdrop/Db/Select/Filter/Numeric.php

@@ -75,6 +75,7 @@ public function apply(Select $select, $conditionSetName, array $queryVars)
                         )
                     );
                 }
+                // break intentionally omitted
             case static::OP_IS_LESS_THAN:
                 if ('' === $op1) {
                     return $select;

Dewdrop/Fields/FieldInterface.php

@@ -72,7 +72,7 @@ public function getId();
 
     /**
      * Get the name used to represent this field in result sets.
-     * 
+     *
      * @return string
      */
     public function getName();

Dewdrop/Fields/Listing/BulkActions.php

@@ -242,7 +242,6 @@ public function process()
                     break;
                 }
             }
-
         }
 
         return $result;

Dewdrop/Fields/Listing/BulkActions/Result.php

@@ -54,7 +54,6 @@ public function __construct($result, $message)
 
         $this->result  = $result;
         $this->message = $message;
-
     }
 
     /**

Dewdrop/Fields/RowEditor.php

@@ -243,7 +243,6 @@ public function linkRowsToFields()
                     $modelName,
                     $link->link($this->getModel($modelName))
                 );
-
             }
         }
 

Dewdrop/Fields/Template/Link.php

@@ -90,7 +90,6 @@ function ($content, TableCell $helper, array $rowData, $rowIndex, $columnIndex)
 
                     return $node;
                 }
-
             }
         );
     }

Dewdrop/Paths.php

@@ -169,7 +169,7 @@ public function getCommands()
 
     /**
      * Get the data folder where Dewdrop can write data on the server.
-     * 
+     *
      * @return string
      */
     public function getData()

Dewdrop/Pimple.php

@@ -41,7 +41,6 @@ private function __construct()
      */
     private function __clone()
     {
-
     }
 
     /**

Dewdrop/Silex/Env.php

@@ -63,7 +63,6 @@ public function bootstrapCli()
 
     public function initializeCli()
     {
-
     }
 
     public function initializePimple(Pimple $pimple)

Dewdrop/Silex/Service/ControllerInjector.php

@@ -108,4 +108,4 @@ public function register(Application $app)
     public function boot(Application $app)
     {
     }
-}
+}

Dewdrop/Test/DomAssertions.php

@@ -66,5 +66,4 @@ public function queryDom($selector, $html)
         $query = new DomQuery($html);
         return $query->execute($selector);
     }
-
 }

Dewdrop/Upload/FileHandler.php

@@ -106,7 +106,7 @@ public function getValidatorChain()
             $uploadFileValidator = new UploadFileValidator();
             $this->validatorChain->attach($uploadFileValidator);
 
-            if(!empty($this->allowedMimeTypes)) {
+            if (!empty($this->allowedMimeTypes)) {
                 $mimeTypeValidator = new MimeTypeValidator();
                 $mimeTypeValidator->addMimeType($this->allowedMimeTypes);
                 $this->validatorChain->attach($mimeTypeValidator);

Dewdrop/Upload/Filter/ScaleImage.php

@@ -61,7 +61,7 @@ public function filter($value)
 
         if ($originalWidth > $originalHeight) {
             $image->scaleImage($this->width, 0);
-        } else if ($originalHeight > $originalWidth) {
+        } elseif ($originalHeight > $originalWidth) {
             $image->scaleImage(0, $this->height);
         } else {
             $image->scaleImage($this->width, $this->height);

Dewdrop/View/Helper/BootstrapForm.php

@@ -365,4 +365,3 @@ protected function controlRequiresLabel($output)
             || false !== stripos($output, 'import-edit-control');
     }
 }
-

Dewdrop/View/Helper/Pagination.php

@@ -34,7 +34,6 @@ public function direct($rowCount, $pageSize, $page, $title = 'Records')
         $out  = '';
 
         if ($rowCount > $pageSize) {
-
             $out .= "<div class=\"page-current-of-all\">Page {$page} of {$pageCount}</div>" .
                 '<ul class="pagination">';
 
@@ -43,26 +42,20 @@ public function direct($rowCount, $pageSize, $page, $title = 'Records')
 
             $j = 0;
             for ($i = 1; $i <= $pageCount; $i++) {
-
                 $display = false;
 
                 if ($page < 7 && $i <= 10) {
                     // Current page is in the first 6, show the first 10 pages
                     $display = true;
-
                 } elseif ($page > $pageCount - 6 && $i >= $pageCount - 10) {
-
                     // Current page is in the last 6, show the last 10 pages
                     $display = true;
-
                 } elseif ($i < 3 || $i > $pageCount - 2 || abs($page - $i) <= 3) {
-
                     // Always show the first 2, last 2, and middle 6 pages
                     $display = true;
                 }
 
                 if ($display) {
-
                     if ($j + 1 !== $i) {
                         // ellipses
                         $out .= '<li class="disabled"><a href="#">...</a></li>';

Dewdrop/View/Helper/Table.php

@@ -250,7 +250,7 @@ protected function getActiveSortDirection($fieldId, SelectSort $sorter = null)
     {
         if (!$sorter) {
             return ('asc' === $this->view->getRequest()->getQuery('dir') ? 'asc' : 'desc');
-        } else if ($sorter->isSorted() && $sorter->getSortedField()->getQueryStringId() === $fieldId) {
+        } elseif ($sorter->isSorted() && $sorter->getSortedField()->getQueryStringId() === $fieldId) {
             return strtolower($sorter->getSortedDirection());
         }
 

Dewdrop/View/View.php

@@ -213,7 +213,6 @@ public function __construct(Escaper $escaper = null, Request $request = null)
      */
     public function init()
     {
-
     }
 
     /**