Use PSR-4 autoloading.

Ukrainian-History · Jul 1, 2016 · 7319829 · 7319829
1 parent d7a79d8
commit 7319829
Show file tree

Hide file tree

Showing 17 changed files with 603 additions and 23 deletions.
diff --git a/lib/CacheFile.class.php → app/Ohms/Interview.php b/lib/CacheFile.class.php → app/Ohms/Interview.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace Ohms;
 /*
  *  Model for the XML CacheFile
  *
@@ -7,7 +7,10 @@
  * @license http://www.uky.edu
  */
 
-class CacheFile {
+use Ohms\Interview\Legacy;
+use Ohms\Interview\Version3;
+
+class Interview {
 	public static function getInstance($cachefile = NULL, $configtmpDir, $config) {
 		$viewerconfig = $config;
 		$tmpDir = $configtmpDir;
@@ -34,12 +37,10 @@ public static function getInstance($cachefile = NULL, $configtmpDir, $config) {
 
 		$cacheversion = (string)$filecheck->record->version;
 		if ($cacheversion=='') {
-			require_once 'LegacyCacheFile.class.php';
-			return LegacyCacheFile::getInstanceLegacy($cachefile, $tmpDir, $viewerconfig);
+			return Legacy::getInstanceLegacy($cachefile, $tmpDir, $viewerconfig);
 		}
 		else {
-			require_once 'Version3CacheFile.class.php';
-			return Version3CacheFile::getInstanceVersion3($cachefile, $tmpDir, $viewerconfig);
+			return Version3::getInstanceVersion3($cachefile, $tmpDir, $viewerconfig);
 		}
 	}
 }

diff --git a/lib/LegacyCacheFile.class.php → app/Ohms/Interview/Legacy.php b/lib/LegacyCacheFile.class.php → app/Ohms/Interview/Legacy.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace Ohms\Interview;
 /*
  *  Model for the XML LegacyCacheFile
  *
@@ -7,9 +7,7 @@
  * @license http://www.uky.edu
  */
 
-require_once 'Transcript.class.php';
-
-class LegacyCacheFile {
+class Legacy {
 	private static $InstanceLegacy = NULL;
 	public $Transcript;
 	private $data;
@@ -111,7 +109,7 @@ public function getFields() {
 
 	public static function getInstanceLegacy($cachefile = NULL, $tmpDir, $viewerconfig) {
 		if (!self::$InstanceLegacy) {
-			self::$InstanceLegacy = new LegacyCacheFile($cachefile, $tmpDir, $viewerconfig);
+			self::$InstanceLegacy = new Legacy($cachefile, $tmpDir, $viewerconfig);
 		}
 		return self::$InstanceLegacy;
 	}

diff --git a/lib/Version3CacheFile.class.php → app/Ohms/Interview/Version3.php b/lib/Version3CacheFile.class.php → app/Ohms/Interview/Version3.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace Ohms\Interview;
 /*
  *  Model for the XML Version3CacheFile
  *
@@ -7,10 +7,11 @@
  * @license http://www.uky.edu
  */
 
-require_once 'Transcript.class.php';
+use Ohms\Transcript;
+
 if(!isset($_GET['translate'])) $_GET['translate'] = '0';
 
-class Version3CacheFile {
+class Version3 {
 	private static $InstanceVersion3 = NULL;
 	public $Transcript;
 	private $data;
@@ -156,7 +157,7 @@ public function getFields() {
 
 	public static function getInstanceVersion3($cachefile = NULL,$tmpDir,$viewerconfig) {
 		if (!self::$InstanceVersion3) {
-			self::$InstanceVersion3 = new Version3CacheFile($cachefile,$tmpDir,$viewerconfig);
+			self::$InstanceVersion3 = new Version3($cachefile,$tmpDir,$viewerconfig);
 		}
 		return self::$InstanceVersion3;
 	}

diff --git a/lib/Transcript.class.php → app/Ohms/Transcript.php b/lib/Transcript.class.php → app/Ohms/Transcript.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace Ohms;
 class Transcript {
 	private $transcript;
 	private $chunks;

diff --git a/lib/ViewerController.class.php → app/Ohms/ViewerController.php b/lib/ViewerController.class.php → app/Ohms/ViewerController.php
@@ -1,6 +1,8 @@
-<?php
+<?php namespace Ohms;
+
+use Ohms\Interview;
+
 session_start();
-require_once 'lib/CacheFile.class.php';
 
 class ViewerController {
 	private $cacheFile;
@@ -9,7 +11,7 @@ class ViewerController {
 	private $config;
 	public function __construct($cacheFileName) {
 		$this->config = parse_ini_file("config/config.ini",true);
-		$this->cacheFile = CacheFile::getInstance($cacheFileName,$this->config['tmpDir'],$this->config);
+		$this->cacheFile = Interview::getInstance($cacheFileName,$this->config['tmpDir'],$this->config);
 		$this->cacheFileName = $cacheFileName;
 	}
 

diff --git a/app/init.php b/app/init.php
@@ -0,0 +1,3 @@
+<?php
+
+require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/composer.json b/composer.json
@@ -0,0 +1,7 @@
+{
+    "autoload": {
+        "psr-4": {
+            "Ohms\\": "app/Ohms"
+        }
+    }
+}
diff --git a/render.php b/render.php
@@ -1,7 +1,8 @@
 <?php
 
+use Ohms\ViewerController;
 
-require_once 'lib/ViewerController.class.php';
+require_once 'app/init.php';
 
 if(isset($_REQUEST['cachefile'])) {
   $kw = (isset($_REQUEST['kw'])) ? $_REQUEST['kw'] : NULL;
@@ -14,4 +15,4 @@
   exit();
 }
 
-?>
+?>
diff --git a/vendor/autoload.php b/vendor/autoload.php
@@ -0,0 +1,7 @@
+<?php
+
+// autoload.php @generated by Composer
+
+require_once __DIR__ . '/composer' . '/autoload_real.php';
+
+return ComposerAutoloaderInit9387792ad7c03b8c2bde1beda1e24982::getLoader();
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		<?php

		require_once __DIR__ . '/../vendor/autoload.php';