Overall improvements

nova-framework · Mar 20, 2018 · 7021445 · 7021445
1 parent 8a882e0
commit 7021445
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 28 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,5 +4,6 @@
 vendor/
 composer.lock
 
-# The developers Playground
-works
+# Local development files
+composer.dev.json
+composer.dev.lock
diff --git a/VERSION.txt b/VERSION.txt
diff --git a/app/Events.php b/app/Events.php
@@ -15,17 +15,6 @@
 // Add a Listener to the Event 'router.matched', to process the global View variables.
 Event::listen('router.matched', function ($route, Request $request)
 {
-    // Share the Application version.
-    $path = BASEPATH .'VERSION.txt';
-
-    if (is_readable($path)) {
-        $version = trim(file_get_contents($path));
-    } else {
-        $version = VERSION;
-    }
-
-    View::share('version', $version);
-
     View::share('currentUri', $request->path());
 });
 

diff --git a/app/Platform/Start.php b/app/Platform/Start.php
@@ -10,6 +10,12 @@
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 
 
+//--------------------------------------------------------------------------
+// Set The Application Version
+//--------------------------------------------------------------------------
+
+define('VERSION', '4.0.9');
+
 //--------------------------------------------------------------------------
 // Set PHP Error Reporting Options
 //--------------------------------------------------------------------------
@@ -30,18 +36,6 @@
     mb_internal_encoding('utf-8');
 }
 
-//--------------------------------------------------------------------------
-// Set The System Path
-//--------------------------------------------------------------------------
-
-define('SYSPATH', BASEPATH .str_replace('/', DS, 'vendor/nova-framework/system/'));
-
-//--------------------------------------------------------------------------
-// Set The Framework Version
-//--------------------------------------------------------------------------
-
-define('VERSION', Application::version());
-
 //--------------------------------------------------------------------------
 // Load Global Configuration
 //--------------------------------------------------------------------------

diff --git a/app/Views/Layouts/Static.tpl b/app/Views/Layouts/Static.tpl
@@ -18,7 +18,7 @@
     <div class="container-fluid">
         <div class="row" style="margin: 15px 0 0;">
             <div class="col-lg-5">
-                <p class="text-muted">Copyright &copy; {{ date('Y') }} <a href="http://www.novaframework.com/" target="_blank"><b>Nova Framework {{ $version; }} / Kernel {{ VERSION }}</b></a></p>
+                <p class="text-muted">Copyright &copy; {{ date('Y') }} <a href="http://www.novaframework.com/" target="_blank"><b>Nova Framework {{ VERSION }} / Kernel {{ App::version() }}</b></a></p>
             </div>
             <div class="col-lg-7">
                 <p class="text-muted pull-right">

diff --git a/app/Views/Pages/Home.php b/app/Views/Pages/Home.php
@@ -9,7 +9,7 @@
 ?>
 
 <div class="row">
-    <h1 class="text-center" style="margin-bottom: 25px;">Welcome to Nova Framework <?= $version; ?></h1>
+    <h1 class="text-center" style="margin-bottom: 25px;">Welcome to Nova Framework <?= VERSION; ?></h1>
     <br>
 
     <div class="alert alert-warning text-center">