Nette 2.4 compatibility

.gitignore

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

MultipleFileUpload/Extension.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace MultipleFileUpload;
+
+use Nette;
+
+class Extension extends Nette\DI\CompilerExtension 
+{
+
+	public function loadConfiguration() {
+		$builder = $this->getContainerBuilder();
+		$this->compiler->parseServices($builder, $this->loadFromFile(__DIR__ . '/config.neon'));
+	}
+
+
+	public function beforeCompile() {
+		parent::beforeCompile();
+	}
+
+
+	public function afterCompile(Nette\PhpGenerator\ClassType $class) {
+		$initialize = $class->methods['initialize'];
+
+		// add ->addMultipleFileUpload shortcut into forms
+		$initialize->addBody(
+			'Nette\Forms\Container::extensionMethod(
+				"\Nette\Forms\Container::addMultipleFileUpload",
+				function (\Nette\Forms\Container $_this, $name, $label = null, $maxFileSize = 25) {
+					return $_this[$name] = new MultipleFileUpload\MultipleFileUpload($label, $maxFileSize, $this->getByType(?), $this->getByType(?)); 
+				}
+			);',
+			['Nette\Http\IRequest', 'MultipleFileUpload\UI\Registrator']
+		);
+
+		$initialize->addBody(
+			'MultipleFileUpload\MultipleFileUpload::init(
+				$this->getByType(?), $this->getByType(?), $this->getByType(?)
+			);',
+			['MultipleFileUpload\Model\IQueues', 'Nette\Http\IRequest', 'MultipleFileUpload\UI\Registrator']
+		);
+
+		$initialize->addBody(
+			'$this->getService(?)->onStartup[] = [?, ?];',
+			['application', 'MultipleFileUpload\MultipleFileUpload', 'handleUploads']
+		);
+		$initialize->addBody(
+			'$this->getService(?)->onShutdown[] = [?, ?];',
+			['application', 'MultipleFileUpload\MultipleFileUpload', 'cleanCache']
+		);
+	}
+
+}

MultipleFileUpload/Model/Dibi/Queue.php

@@ -13,7 +13,6 @@
 
 use dibi,
 	MultipleFileUpload\Model\BaseQueue,
-	Nette\Environment,
 	Nette\Http\FileUpload,
 	Nette\InvalidStateException;
 
@@ -94,23 +93,19 @@ function updateFile($name, $chunk, FileUpload $file = null)
 	 */
 	function getUploadedFilesTemporaryPath()
 	{
-		if (!Queues::$uploadsTempDir) {
-			Queues::$uploadsTempDir = Environment::expand("%tempDir%" . DIRECTORY_SEPARATOR . "uploads-MFU");
+		if (!$this->getQueuesModel()->uploadsTempDir) {
+			throw new InvalidStateException("Directory for temp files is not set.");
 		}
 
-		if (!file_exists(Queues::$uploadsTempDir)) {
-			mkdir(Queues::$uploadsTempDir, 0777, true);
+		if (!file_exists($this->getQueuesModel()->uploadsTempDir)) {
+			mkdir($this->getQueuesModel()->uploadsTempDir, 0777, true);
 		}
 
-		if (!is_writable(Queues::$uploadsTempDir)) {
-			Queues::$uploadsTempDir = Environment::expand("%tempDir%");
-		}
-
-		if (!is_writable(Queues::$uploadsTempDir)) {
+		if (!is_writable($this->getQueuesModel()->uploadsTempDir)) {
 			throw new InvalidStateException("Directory for temp files is not writable!");
 		}
 
-		return Queues::$uploadsTempDir;
+		return $this->getQueuesModel()->uploadsTempDir;
 	}
 
 
@@ -163,4 +158,4 @@ function getLastAccess()
 	}
 
 
-}
+}

MultipleFileUpload/Model/Dibi/Queues.php

@@ -11,10 +11,9 @@
 
 namespace MultipleFileUpload\Model\Dibi;
 
-use dibi,
+use DibiConnection,
 	MultipleFileUpload\Model\BaseQueues,
-	MultipleFileUpload\Model\IQueue,
-	Nette\InvalidStateException;
+	MultipleFileUpload\Model\IQueue;
 
 /**
  * Multiple File Uploader driver for Dibi
@@ -28,13 +27,13 @@ class Queues extends BaseQueues
 	 * Path to directory of uploaded files (temp)
 	 * @var string
 	 */
-	public static $uploadsTempDir;
+	public $uploadsTempDir;
 
 	/**
 	 * Connection
-	 * @var \DibiConnection
+	 * @var DibiConnection
 	 */
-	public static $dibiConnection;
+	public $connection;
 
 
 	/**
@@ -45,38 +44,24 @@ function initialize()
 
 	}
 
-
-	// <editor-fold defaultstate="collapsed" desc="Database functions">
-
-	/**
-	 * Gets dibi connection
-	 * @return \DibiConnection
-	 */
-	function getConnection()
+	public function __construct(string $tempDir, DibiConnection $conection)
 	{
-		if (!self::$dibiConnection) {
-			self::$dibiConnection = dibi::getConnection();
+		$this->uploadsTempDir = $tempDir;
+		if(!file_exists($this->uploadsTempDir)) {
+			mkdir($this->uploadsTempDir, 0775, TRUE);
 		}
-		return self::$dibiConnection;
+		$this->conection = $conection;
 	}
 
-
 	/**
-	 * Executes query
-	 * @return \DibiResult
-	 * @throws InvalidStateException
+	 * @return DibiConnection 
 	 */
-	function query()
+	public function getConnection()
 	{
-		$params = func_get_args();
-		return call_user_func_array(
-			array($this->getConnection(), 'query'), $params
-		);
+		return $this->database;
 	}
-
-
-	// </editor-fold>
-
+
+
 	/**
 	 * Gets queue (create if needed)
 	 * @param string $id
@@ -95,7 +80,7 @@ function getQueue($id)
 	 */
 	function createQueueObj($queueID)
 	{
-		$queue = new Queue();
+		$queue = new Queue(); // todo: remove setQueuesModel --> move to __construct
 		$queue->setQueuesModel($this);
 		$queue->setQueueID($queueID);
 		$queue->initialize();
@@ -108,13 +93,13 @@ function createQueueObj($queueID)
 	 */
 	function cleanup()
 	{
-		$this->getConnection()->begin();
+		$this->connection->begin();
 		foreach ($this->getQueues() AS $queue) {
 			if ($queue->getLastAccess() < time() - $this->getLifeTime()) {
 				$queue->delete();
 			}
 		}
-		$this->getConnection()->commit();
+		$this->connection->commit();
 	}
 
 
@@ -136,4 +121,4 @@ function getQueues()
 	}
 
 
-}
+}

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,8 +48,12 @@ public function getFilesTable(){
 		return self::$filesTable;
 	}
 
-	public function __construct(\Nette\Database\Context $database)
+	public function __construct($tempDir, Nette\Database\Context $database)
 	{
+		self::$uploadsTempDir = $tempDir;
+		if(!file_exists(self::$uploadsTempDir)) {
+			mkdir(self::$uploadsTempDir, 0775, TRUE);
+		}
 		$this->database = $database;
 	}
 
@@ -122,4 +126,4 @@ function getQueues()
 	}
 
 
-}
+}