Merge pull request #21 from xificurk/v2.1

v2.1

Author: xificurk

README.md

@@ -8,12 +8,12 @@ Rozšíření pro [Nette](https://github.com/nette/nette) integrující [PHP kni
 
 # Požadavky
 
-[Nette Framework](https://github.com/nette/nette) verze 2.1 nebo vyšší. Detaily v [composer.json](./composer.json).
+[Nette Framework](https://github.com/nette/nette) verze 2.4 nebo vyšší. Detaily v [composer.json](./composer.json).
 
 
 # Instalace
 
-Nainstalujte balíček přes composer ``composer require skautis/nette:2.0.*``, zaregistrujte a nastavte rozšíření (extension) v konfiguračním souboru.
+Nainstalujte balíček přes composer ``composer require skautis/nette:^2.1``, zaregistrujte a nastavte rozšíření (extension) v konfiguračním souboru.
 
 Ukázka minimální konfigurace:
 ```

composer.json

@@ -24,8 +24,7 @@
 	},
 	"require-dev": {
 		"nette/tester": "~1.3",
-		"nette/nette": "^2.4@dev",
-		"nette/utils": "^2.4@dev"
+		"nette/nette": "^2.4@dev"
 	},
     "suggest": {
         "tracy/tracy": "to enable skautis panel for Tracy debug bar.",

docs/konfigurace.md

@@ -17,7 +17,7 @@ Pomocí volby `compression: FALSE` je možné vypnout kompresi při provádění
 
 ## Profiler
 
-Pokud máte nainstalovánou [Tracy](https://github.com/nette/tracy), nebo používáte Nette verze 2.1, tak se v testovacím modu Nette automaticky aktivuje skautis panel, který sleduje všechny dotazy na skautis.
+Pokud máte nainstalovánou [Tracy](https://github.com/nette/tracy), tak se v testovacím modu Nette automaticky aktivuje skautis panel, který sleduje všechny dotazy na skautis.
 
 ![Skautis panel pro ladění aplikace](skautis-panel.png)
 

src/CacheAdapter.php

@@ -8,18 +8,14 @@
 use Skautis\Wsdl\Decorator\Cache\CacheInterface;
 
 
-if (!class_exists('Nette\Utils\DateTime') && class_exists('Nette\DateTime')) {
-	// BC with Nette 2.1
-	class_alias('Nette\DateTime', 'Nette\Utils\DateTime');
-}
-
-
 /**
  * Nette cache adapter for Skautis library
  */
 class CacheAdapter implements CacheInterface
 {
 
+	use Nette\SmartObject;
+
 	/** @var IStorage */
 	private $storage;
 
@@ -101,7 +97,7 @@ public function set($key, $data)
 	 */
 	private function getDependencies()
 	{
-		$dependencies = array();
+		$dependencies = [];
 
 		if (isset($this->expiration)) {
 			$dependencies[Cache::EXPIRATION] = Nette\Utils\DateTime::from($this->expiration)->format('U') - time();
@@ -128,7 +124,7 @@ protected function generateKey($key)
 	 */
 	public function clean()
 	{
-		$this->storage->clean(array(Cache::ALL => TRUE));
+		$this->storage->clean([Cache::ALL => TRUE]);
 	}
 
 }

src/SessionAdapter.php

@@ -12,6 +12,8 @@
 class SessionAdapter implements AdapterInterface
 {
 
+	use Nette\SmartObject;
+
 	/** @var Nette\Http\SessionSection */
 	protected $sessionSection;
 

src/SkautisExtension.php

@@ -3,7 +3,6 @@
 namespace Skautis\Nette;
 
 use Nette;
-use Nette\DI\Config;
 use Skautis;
 use Tracy\Debugger;
 
@@ -34,7 +33,7 @@ public function loadConfiguration()
 		$config['profiler'] = isset($config['profiler']) ? $config['profiler'] : !empty($container->parameters['debugMode']);
 
 		$container->addDefinition($this->prefix('config'))
-			->setClass(Skautis\Config::class, array($config['applicationId'], $config['testMode'], $config['cache'], $config['compression']));
+			->setClass(Skautis\Config::class, [$config['applicationId'], $config['testMode'], $config['cache'], $config['compression']]);
 
 		$container->addDefinition($this->prefix('webServiceFactory'))
 			->setClass(Skautis\Wsdl\WebServiceFactory::class);
@@ -54,7 +53,7 @@ public function loadConfiguration()
 		if ($config['profiler'] && class_exists(Debugger::class)) {
 			$panel = $container->addDefinition($this->prefix('panel'))
 				->setClass(Skautis\Nette\Tracy\Panel::class);
-			$manager->addSetup([$panel, 'register'], array($manager));
+			$manager->addSetup([$panel, 'register'], [$manager]);
 		}
 	}
 

src/Tracy/Panel.php

@@ -15,13 +15,11 @@
  */
 class Panel implements Tracy\IBarPanel
 {
-	use Nette\SmartObject;
 
-	/** @var string */
-	private $htmlPrefix = 'tracy';
+	use Nette\SmartObject;
 
 	/** @var array */
-	private $queries = array();
+	private $queries = [];
 
 
 	/**
@@ -31,8 +29,8 @@ class Panel implements Tracy\IBarPanel
 	 */
 	public function register(WsdlManager $wsdlManager)
 	{
-		$wsdlManager->addWebServiceListener(WebService::EVENT_SUCCESS, array($this, 'logEvent'));
-		$wsdlManager->addWebServiceListener(WebService::EVENT_FAILURE, array($this, 'logEvent'));
+		$wsdlManager->addWebServiceListener(WebService::EVENT_SUCCESS, [$this, 'logEvent']);
+		$wsdlManager->addWebServiceListener(WebService::EVENT_FAILURE, [$this, 'logEvent']);
 		Tracy\Debugger::getBar()->addPanel($this);
 	}
 
@@ -73,19 +71,19 @@ public function getPanel()
 		$cnt = 0;
 		$s = "";
 		foreach ($this->queries as $query) {
-			$rowId = "{$this->htmlPrefix}-debug-Skautis-args-row-$cnt";
+			$rowId = "tracy-debug-Skautis-args-row-$cnt";
 			$s .= "<tr>"
 				. "<td>" . sprintf('%0.2f', $query->time * 1000) . "</td>"
-				. "<td>{$query->fname}(" . $this->formatToggle('Args', $rowId) . ")<div id='$rowId' class='{$this->htmlPrefix}-collapsed'>" . $this->dump(reset($query->args[0])) . "</div></td>"
-				. "<td>" . $this->formatToggle('Result'). "<div class='{$this->htmlPrefix}-collapsed'>" . $this->dump($query->result) . "</div></td>"
+				. "<td>{$query->fname}(" . $this->formatToggle('Args', $rowId) . ")<div id='$rowId' class='tracy-collapsed'>" . $this->dump(reset($query->args[0])) . "</div></td>"
+				. "<td>" . $this->formatToggle('Result'). "<div class='tracy-collapsed'>" . $this->dump($query->result) . "</div></td>"
 				. "<td>" . $this->prepareTrace($query->trace) . "</td>"
 				. "</tr>";
 			$cnt++;
 		}
 
 		return empty($this->queries) ? '' :
 			'<h1>Skautis</h1>'
-			. '<div class="' . $this->htmlPrefix . '-inner">'
+			. '<div class="tracy-inner">'
 			. '<table>'
 			. '<tr><th>Time&nbsp;ms</th><th>Function&nbsp;name</th><th>Result</th><th>Trace</th></tr>'
 			. $s
@@ -105,7 +103,7 @@ protected function prepareTrace(array $trace)
 		foreach ($trace as $f) {
 			$s .= "" . ++$cnt . ". " . $f['function'] . " (" . (array_key_exists("class", $f) ? ":" . $f['class'] : "") . (array_key_exists("line", $f) ? ":" . $f['line'] : "") . ")" . '<br>';
 		}
-		return $this->formatToggle('Trace') . "<div class='{$this->htmlPrefix}-collapsed'>" . $s . "</div>";
+		return $this->formatToggle('Trace') . "<div class='tracy-collapsed'>" . $s . "</div>";
 	}
 
 
@@ -126,11 +124,7 @@ protected function dump($object)
 	 */
 	protected function formatToggle($name, $rel = NULL)
 	{
-		// BC with Nette 2.1
-		$toggleClass = $this->htmlPrefix === 'tracy'
-			? "{$this->htmlPrefix}-toggle {$this->htmlPrefix}-collapsed"
-			: "{$this->htmlPrefix}-toggler {$this->htmlPrefix}-toggle-collapsed";
-		return "<a href='#" . ($rel === NULL ? "" : "$rel' rel='#$rel") . "' class='$toggleClass'>$name</a>";
+		return "<a href='#" . ($rel === NULL ? "" : "$rel' rel='#$rel") . "' class='tracy-toggle tracy-collapsed'>$name</a>";
 	}
 
 }