Nette 2.4 compatibility

.gitignore

@@ -1,3 +1,5 @@
 /nbproject/
 /composer.lock
-/Nette/
+/Nette/
+.idea/
+vendor/

MultipleFileUpload/Extension.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace MultipleFileUpload;
+
+use Nette;
+
+class Extension extends Nette\DI\CompilerExtension {
+
+    public function loadConfiguration() {
+    }
+
+    public function beforeCompile() {
+        parent::beforeCompile();
+    }
+
+    public function afterCompile(Nette\PhpGenerator\ClassType $class) {
+        $initialize = $class->methods['initialize'];
+        $initialize->addBody('MultipleFileUpload\MultipleFileUpload::init($this->getByType(?), $this->getParameters());', ['Nette\Http\IRequest']);
+        $initialize->addBody('MultipleFileUpload\MultipleFileUpload::register($this->getService(?));', ['mfuStorage']);
+        $initialize->addBody('$this->getService(?)->onStartup[] = [?, ?];', ['application', 'MultipleFileUpload\MultipleFileUpload', 'handleUploads']);
+        $initialize->addBody('$this->getService(?)->onShutdown[] = [?, ?];', ['application', 'MultipleFileUpload\MultipleFileUpload', 'cleanCache']);
+    }
+
+}

MultipleFileUpload/Model/IQueue.php

@@ -72,7 +72,7 @@ function addFileManually($name, $chunk, $chunks);
 	 * @param type $chunk
 	 * @param FileUpload $file
 	 */
-	function updateFile($name, $chunk, FileUpload $file = null);
+	function updateFile($name, $chunk, FileUpload $file);
 
 	/**
 	 * Gets all files in queue

MultipleFileUpload/Model/NetteDatabase/Queue.php

@@ -12,7 +12,6 @@
 namespace MultipleFileUpload\Model\NetteDatabase;
 
 use MultipleFileUpload\Model\BaseQueue,
-	Nette\Environment,
 	Nette\Http\FileUpload,
 	Nette\InvalidStateException;
 
@@ -68,8 +67,9 @@ function addFileManually($name, $chunk, $chunks)
 
 	function updateFile($name, $chunk, FileUpload $file = null)
 	{
-		$this->getConnection()->beginTransaction();
-		$selection = $this->getConnection()->table($this->getFilesTable())->where('queueID', $this->getQueueID())->where('name', $name);
+		$connection = $this->getConnection();
+		$connection->beginTransaction();
+		$selection = $connection->table($this->getFilesTable())->where('queueID', $this->getQueueID())->where('name', $name);
 
 		$data = array("chunk" => $chunk);
 		if ($file){
@@ -79,7 +79,7 @@ function updateFile($name, $chunk, FileUpload $file = null)
 		foreach ($selection as $row){
 			$row->update($data);
 		}
-		$this->getConnection()->commit();
+		$connection->commit();
 	}
 
 
@@ -90,17 +90,13 @@ function updateFile($name, $chunk, FileUpload $file = null)
 	function getUploadedFilesTemporaryPath()
 	{
 		if (!Queues::$uploadsTempDir) {
-			Queues::$uploadsTempDir = Environment::expand("%tempDir%" . DIRECTORY_SEPARATOR . "uploads-MFU");
+			throw new InvalidStateException("Directory for temp files is not set.");
 		}
 
 		if (!file_exists(Queues::$uploadsTempDir)) {
 			mkdir(Queues::$uploadsTempDir, 0777, true);
 		}
 
-		if (!is_writable(Queues::$uploadsTempDir)) {
-			Queues::$uploadsTempDir = Environment::expand("%tempDir%");
-		}
-
 		if (!is_writable(Queues::$uploadsTempDir)) {
 			throw new InvalidStateException("Directory for temp files is not writable!");
 		}
@@ -152,4 +148,4 @@ function getLastAccess()
 	}
 
 
-}
+}

MultipleFileUpload/Model/NetteDatabase/Queues.php

@@ -13,7 +13,7 @@
 
 use MultipleFileUpload\Model\BaseQueues,
 	MultipleFileUpload\Model\IQueue,
-	Nette\InvalidStateException;
+	Nette;
 
 /**
  * Multiple File Uploader driver for Nette\Database
@@ -48,9 +48,17 @@ public function getFilesTable(){
 		return self::$filesTable;
 	}
 
-	public function __construct(\Nette\Database\Context $database)
+	public function __construct($database, $tempDir)
 	{
-		$this->database = $database;
+		// TODO: wrong; there must be not dependency on container here
+		$connection = new Nette\Database\Connection($database['dsn'], $database['user'], $database['password']);
+		self::$uploadsTempDir = $tempDir . DIRECTORY_SEPARATOR . "uploads-MFU";
+		if(!file_exists(self::$uploadsTempDir)) {
+			mkdir(self::$uploadsTempDir, 0775, TRUE);
+		};
+		$cacheStorage = new Nette\Caching\Storages\FileStorage(self::$uploadsTempDir);
+		$structure = new Nette\Database\Structure($connection, $cacheStorage);
+		$this->database = new Nette\Database\Context($connection, $structure);
 	}
 
 	// <editor-fold defaultstate="collapsed" desc="Database functions">

MultipleFileUpload/MultipleFileUpload.php

@@ -15,14 +15,15 @@
 use MultipleFileUpload\Model\IQueue,
 	MultipleFileUpload\Model\IQueues,
 	MultipleFileUpload\UI\Registrator,
-	Nette\Environment,
+	Latte,
+	Nette,
+	Nette\Bridges,
 	Nette\Forms,
 	Nette\Forms\Container,
 	Nette\Forms\Controls\UploadControl,
 	Nette\Http\FileUpload,
 	Nette\InvalidStateException,
 	Nette\NotSupportedException,
-	Nette\Utils\Callback,
 	Nette\Utils\Html,
 	Nette\Utils\Strings;
 
@@ -62,35 +63,35 @@ class MultipleFileUpload extends UploadControl
 	 */
 	public static $baseWWWRoot = null;
 
+	/** @var Nette\Http\IRequest */
+	private static $request;
+
+	/** @var bool */
+	private static $productionMode;
 
 	/**
 	 * Initialize MFU
 	 */
-	public static function init()
+	public static function init(Nette\Http\IRequest $request, Array $parameters)
 	{
 		// Init UI registrator
 		$uiReg = self::$interfaceRegistrator = new Registrator();
 		$uiReg->register("MultipleFileUpload\\UI\\HTML4SingleUpload");
 		$uiReg->register("MultipleFileUpload\\UI\\Plupload");
-
+		self::$request = $request;
+		self::$productionMode = $parameters['productionMode'];
 		// Set default check callback
-		self::$validateFileCallback = callback(__CLASS__, "validateFile");
-
-		// TODO: remove this magic
-		self::$baseWWWRoot = Environment::getHttpRequest()->url->baseUrl . "MultipleFileUpload/";
+		self::$validateFileCallback = [__CLASS__, "validateFile"];
+		self::$baseWWWRoot = self::$request->url->baseUrl . "MultipleFileUpload/";
 	}
 
 
 	/**
 	 * Register MFU into Nette
 	 */
-	public static function register()
-	{
-		self::init();
-
-		$application = Environment::getApplication();
-		$application->onStartup[] = callback(__CLASS__, "handleUploads");
-		$application->onShutdown[] = callback(__CLASS__, "cleanCache");
+	public static function register(Model\IQueues $queuesModel)
+	{   
+            self::$queuesModel = $queuesModel;
 	}
 
 
@@ -133,8 +134,7 @@ public static function handleUploads()
 			self::$handleUploadsCalled = true;
 		}
 
-		$req = Environment::getHttpRequest();
-
+        $req = self::$request;
 		// Workaround for: http://forum.nettephp.com/cs/3680-httprequest-getheaders-a-content-type
 		$contentType = $req->getHeader("content-type");
 		if (!$contentType and isset($_SERVER["CONTENT_TYPE"])) {
@@ -147,7 +147,7 @@ public static function handleUploads()
 
 		self::getQueuesModel()->initialize();
 
-		foreach (self::getUIRegistrator()->getInterfaces() AS $interface) {
+		foreach (self::getUIRegistrator()->getInterfaces(self::$request) AS $interface) {
 //			\Nette\Diagnostics\Debugger::log($interface->getReflection()->getName().": is this your upload? ".$interface->isThisYourUpload());
 			if ($interface->isThisYourUpload()) {
 				$ret = $interface->handleUploads();
@@ -174,7 +174,7 @@ public static function validateFile(FileUpload $file)
 	 */
 	public static function cleanCache()
 	{
-		if (!Environment::isProduction() or rand(1, 100) < 5) {
+		if (FALSE == self::$productionMode or rand(1, 100) < 5) {
 			self::getQueuesModel()->cleanup();
 		}
 	}
@@ -186,12 +186,8 @@ public static function cleanCache()
 	 */
 	public static function getQueuesModel()
 	{
-		if (!self::$queuesModel) { // if nothing is set, setup sqlite model, which should work on all systems with SQLite
-			self::setQueuesModel(new Model\SQLite3\Queues());
-		}
-
 		if (!self::$queuesModel instanceof IQueues) {
-			throw new InvalidStateException("Queues model is not instance of Model\IQueues!");
+			throw new InvalidStateException("Queues model was not set or is not instance of Model\IQueues!");
 		}
 		return self::$queuesModel;
 	}
@@ -258,15 +254,13 @@ public static function getHead()
 	 */
 	public $simUploadThreads;
 
-
 	/**
 	 * Constructor
 	 * @param string $label Label
 	 */
 	public function __construct($label = NULL, $maxSelectedFiles = 25)
 	{
 		parent::__construct($label);
-
 		if (!self::$handleUploadsCalled) {
 			throw new InvalidStateException("MultipleFileUpload::handleUpload() has not been called. Call `MultipleFileUpload::register();` from your bootstrap before you call Applicaton::run();");
 		};
@@ -291,12 +285,11 @@ public function getControl()
 
 		// <section token field>
 		$tokenField = Html::el('input type=hidden')->name($this->getHtmlName() . '[token]')->value($this->getToken());
-		$control->add($tokenField);
+		$control->addHtml($tokenField);
 		// </section token field>
 
 		$fallbacks = array();
-
-		$interfaces = self::getUIRegistrator()->getInterfaces();
+		$interfaces = self::getUIRegistrator()->getInterfaces(self::$request);
 		$num = count($interfaces);
 		$cnt = 1;
 		foreach ($interfaces AS $interface) {
@@ -324,14 +317,15 @@ public function getControl()
 			}
 			$cnt++;
 
-			$control->add($container);
+			$control->addHtml($container);
 		}
 
-		$template = new UI\Template();
-		$template->setFile(dirname(__FILE__) . DIRECTORY_SEPARATOR . "RegisterJS.latte");
-		$template->id = $this->getHtmlId();
-		$template->fallbacks = $fallbacks;
-		$control->add($template->__toString(TRUE));
+			$latte = new Latte\Engine();
+			$template = new Bridges\ApplicationLatte\Template($latte);
+			$template->setFile(__DIR__ . DIRECTORY_SEPARATOR . "RegisterJS.latte");
+			$template->id = $this->getHtmlId();
+			$template->fallbacks = $fallbacks;
+			$control->addHtml($template->__toString(TRUE));
 		/*
 		  // <section without JavaScript>
 		  $withoutJS = Html::el("div class=withoutJS");

MultipleFileUpload/UI/AbstractInterface.php

@@ -12,11 +12,12 @@
 namespace MultipleFileUpload\UI;
 
 use MultipleFileUpload\MultipleFileUpload,
-	Nette\Environment,
+	Nette,
+	Latte,
+	Nette\Bridges,
 	Nette\Http\FileUpload,
 	Nette\Http\Request,
-	Nette\Object,
-	Nette\Utils\Callback;
+	Nette\Object;
 
 /**
  * Abstract UI Controller
@@ -27,9 +28,9 @@ abstract class AbstractInterface extends Object implements IUserInterface
 	protected $httpRequest;
 
 
-	public function __construct()
+	public function __construct(Nette\Http\Request $httpRequest)
 	{
-		$this->httpRequest = Environment::getHttpRequest();
+		$this->httpRequest = $httpRequest;
 	}
 
 
@@ -72,18 +73,14 @@ function processFile($token, $file)
 	}
 
 
-	/**
-	 * @return Template
-	 */
-	protected function createTemplate($file = null)
+	protected function createTemplate()
 	{
-		$template = new Template($file);
-
+        $latte = new Latte\Engine();
+        $template = new Bridges\ApplicationLatte\Template($latte);
 		$template->baseUrl = $this->httpRequest->url->baseUrl;
 		$template->basePath = rtrim($template->baseUrl, '/');
 		$template->interface = $this;
-
-		$template->registerHelperLoader('Nette\Templating\Helpers::loader');
+        $template->addFilter(NULL, 'Latte\Macros\CoreMacros::install');
 
 		return $template;
 	}

MultipleFileUpload/UI/HTML4SingleUpload/Controller.php

@@ -89,7 +89,8 @@ public function handleUploads()
 	 */
 	public function render(MultipleFileUpload $upload)
 	{
-		$template = $this->createTemplate(dirname(__FILE__) . "/html.latte");
+		$template = parent::createTemplate();
+		$template->setFile(__DIR__ . "/html.latte");
 		$template->maxFiles = $upload->maxFiles;
 		$template->mfu = $upload;
 		return $template->__toString(TRUE);
@@ -101,7 +102,8 @@ public function render(MultipleFileUpload $upload)
 	 */
 	public function renderInitJavaScript(MultipleFileUpload $upload)
 	{
-		return $this->createTemplate(dirname(__FILE__) . "/initJS.latte")->__toString(TRUE);
+        $template = parent::createTemplate();
+		return $template->setFile(__DIR__ . "/initJS.latte")->__toString(TRUE);
 	}
 
 

MultipleFileUpload/UI/HTML4SingleUpload/html.latte

@@ -34,7 +34,7 @@
 * @link       http://nettephp.com/cs/extras/multiplefileupload
 *}
 
-{?
+{php
 $input =  \Nette\Utils\Html::el("input type=file")->name($mfu->getHtmlName().'[files][]');
 }