From a38eb7aa904b5fd6ab45ca29607e91d1831f62e5 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Fri, 12 Aug 2016 12:02:14 +0200
Subject: [PATCH] (mvc) change case for Migrations directory

---
 src/opnsense/mvc/app/models/OPNsense/Base/BaseModel.php     | 2 +-
 .../Base/BaseModel/{migrations => Migrations}/M0_0_1.php    | 2 +-
 .../Base/BaseModel/{migrations => Migrations}/M1_0_0.php    | 4 ++--
 .../Base/BaseModel/{migrations => Migrations}/M1_0_1.php    | 4 ++--
 .../tests/app/models/OPNsense/Base/BaseModel/TestModel.php  | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/{migrations => Migrations}/M0_0_1.php (96%)
 rename src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/{migrations => Migrations}/M1_0_0.php (96%)
 rename src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/{migrations => Migrations}/M1_0_1.php (96%)

diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/BaseModel.php b/src/opnsense/mvc/app/models/OPNsense/Base/BaseModel.php
index 6c49cb4cd..8491aa3b4 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/BaseModel.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/BaseModel.php
@@ -535,7 +535,7 @@ abstract class BaseModel
                     version_compare($this->internal_model_version, $mig_version, '>=') ) {
                     // execute upgrade action
                     $tmp = explode('.', basename($filename))[0];
-                    $mig_classname = "\\".$class_info->getNamespaceName()."\\migrations\\".$tmp;
+                    $mig_classname = "\\".$class_info->getNamespaceName()."\\Migrations\\".$tmp;
                     $mig_class = new \ReflectionClass($mig_classname);
                     if ($mig_class->getParentClass()->name == 'OPNsense\Base\BaseModelMigration') {
                         $migobj = $mig_class->newInstance();
diff --git a/src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/migrations/M0_0_1.php b/src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/Migrations/M0_0_1.php
similarity index 96%
rename from src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/migrations/M0_0_1.php
rename to src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/Migrations/M0_0_1.php
index 7cf2ab9a0..b8e7a2f06 100644
--- a/src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/migrations/M0_0_1.php
+++ b/src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/Migrations/M0_0_1.php
@@ -27,7 +27,7 @@
  *
  */
 
-namespace tests\OPNsense\Base\BaseModel\migrations;
+namespace tests\OPNsense\Base\BaseModel\Migrations;
 
 use OPNsense\Base\BaseModelMigration;
 
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
similarity index 96%
rename from src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/migrations/M1_0_0.php
rename to src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/Migrations/M1_0_0.php
index 8cb129fa3..1b2f872b2 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
@@ -27,7 +27,7 @@
  *
  */
 
-namespace tests\OPNsense\Base\BaseModel\migrations;
+namespace tests\OPNsense\Base\BaseModel\Migrations;
 
 use OPNsense\Base\BaseModelMigration;
 
@@ -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
similarity index 96%
rename from src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/migrations/M1_0_1.php
rename to src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/Migrations/M1_0_1.php
index b94b7b1a1..f1d9c9528 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
@@ -27,7 +27,7 @@
  *
  */
 
-namespace tests\OPNsense\Base\BaseModel\migrations;
+namespace tests\OPNsense\Base\BaseModel\Migrations;
 
 use OPNsense\Base\BaseModelMigration;
 
@@ -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
diff --git a/src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/TestModel.php b/src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/TestModel.php
index 4be3d2b75..219f5d97e 100644
--- a/src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/TestModel.php
+++ b/src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/TestModel.php
@@ -30,9 +30,9 @@ namespace tests\OPNsense\Base\BaseModel;
 
 use OPNsense\Base\BaseModel;
 
-require_once 'migrations/M0_0_1.php';
-require_once 'migrations/M1_0_0.php';
-require_once 'migrations/M1_0_1.php';
+require_once 'Migrations/M0_0_1.php';
+require_once 'Migrations/M1_0_0.php';
+require_once 'Migrations/M1_0_1.php';
 
 /**
  * Class TestModel