From 4425c28ea09943c4eb3a2a7f8344cf74fd27453f Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sat, 13 Aug 2016 12:50:58 +0200
Subject: [PATCH] src: extend whitespace sweep to root dir files

---
 +POST_INSTALL                                                   | 2 +-
 Makefile                                                        | 2 ++
 .../mvc/app/models/OPNsense/Base/BaseModelMigration.php         | 2 +-
 .../app/models/OPNsense/Base/BaseModel/Migrations/M1_0_0.php    | 2 +-
 .../app/models/OPNsense/Base/BaseModel/Migrations/M1_0_1.php    | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/+POST_INSTALL b/+POST_INSTALL
index e9d2af0d6..5cea68466 100644
--- a/+POST_INSTALL
+++ b/+POST_INSTALL
@@ -52,7 +52,7 @@ fi
 echo "Flush Phalcon volt templates"
 rm -f /usr/local/opnsense/mvc/app/cache/*.php
 
-echo "Execute model migrations" 
+echo "Execute model migrations"
 /usr/local/opnsense/mvc/script/run_migrations.php
 
 echo "Reloading GUI configuration"
diff --git a/Makefile b/Makefile
index 8d7442e92..ea4031eb8 100644
--- a/Makefile
+++ b/Makefile
@@ -298,6 +298,8 @@ sweep: force
 	    xargs -0 -n1 scripts/cleanfile
 	find ${.CURDIR}/scripts -type f -print0 | \
 	    xargs -0 -n1 scripts/cleanfile
+	find ${.CURDIR} -type f -depth 1 -print0 | \
+	    xargs -0 -n1 scripts/cleanfile
 
 style: want-pear-PHP_CodeSniffer
 	@(phpcs --tab-width=4 --standard=PSR2 ${.CURDIR}/src/opnsense/mvc \
diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/BaseModelMigration.php b/src/opnsense/mvc/app/models/OPNsense/Base/BaseModelMigration.php
index 381b6fc81..a3fda20b2 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/BaseModelMigration.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/BaseModelMigration.php
@@ -41,7 +41,7 @@ abstract class BaseModelMigration
      * Walk through all nodes and check required defaults
      * @param $node
      */
-    private function checkDefaults($node) 
+    private function checkDefaults($node)
     {
         foreach ($node->__items as $key => $subnode) {
             if (count($subnode->__items) > 0) {
diff --git a/src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/Migrations/M1_0_0.php b/src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/Migrations/M1_0_0.php
index 1b2f872b2..a57c5475c 100644
--- a/src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/Migrations/M1_0_0.php
+++ b/src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/Migrations/M1_0_0.php
@@ -38,4 +38,4 @@ class M1_0_0 extends BaseModelMigration
         $current_value = (string)$model->general->FromEmail;
         $model->general->FromEmail = "100_" . $current_value;
     }
-}
\ No newline at end of file
+}
diff --git a/src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/Migrations/M1_0_1.php b/src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/Migrations/M1_0_1.php
index f1d9c9528..83e408085 100644
--- a/src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/Migrations/M1_0_1.php
+++ b/src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/Migrations/M1_0_1.php
@@ -38,4 +38,4 @@ class M1_0_1 extends BaseModelMigration
         $current_value = (string)$model->general->FromEmail;
         $model->general->FromEmail = "101_" . $current_value;
     }
-}
\ No newline at end of file
+}