From ffb5236eccfd8a361522619ce38ac4e7e22e7428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mor=C3=A1vek?= Date: Thu, 5 Apr 2018 21:29:21 +0200 Subject: [PATCH 1/5] Remove duplicate dependency --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index fdfa9e7..98d2ae1 100644 --- a/composer.json +++ b/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.", From a08846db498400aa0a219a9d4f86372a17720bf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mor=C3=A1vek?= Date: Thu, 5 Apr 2018 21:35:25 +0200 Subject: [PATCH 2/5] Remove BC workarounds for unsupported Nette versions --- src/CacheAdapter.php | 6 ------ src/SkautisExtension.php | 1 - src/Tracy/Panel.php | 19 ++++++------------- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/src/CacheAdapter.php b/src/CacheAdapter.php index e619830..cdf4d04 100644 --- a/src/CacheAdapter.php +++ b/src/CacheAdapter.php @@ -8,12 +8,6 @@ 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 */ diff --git a/src/SkautisExtension.php b/src/SkautisExtension.php index 042c2e5..084ebd2 100644 --- a/src/SkautisExtension.php +++ b/src/SkautisExtension.php @@ -3,7 +3,6 @@ namespace Skautis\Nette; use Nette; -use Nette\DI\Config; use Skautis; use Tracy\Debugger; diff --git a/src/Tracy/Panel.php b/src/Tracy/Panel.php index 27bf7ee..20cf335 100644 --- a/src/Tracy/Panel.php +++ b/src/Tracy/Panel.php @@ -17,9 +17,6 @@ class Panel implements Tracy\IBarPanel { use Nette\SmartObject; - /** @var string */ - private $htmlPrefix = 'tracy'; - /** @var array */ private $queries = array(); @@ -73,11 +70,11 @@ 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 .= "" . "" . sprintf('%0.2f', $query->time * 1000) . "" - . "{$query->fname}(" . $this->formatToggle('Args', $rowId) . ")
" . $this->dump(reset($query->args[0])) . "
" - . "" . $this->formatToggle('Result'). "
" . $this->dump($query->result) . "
" + . "{$query->fname}(" . $this->formatToggle('Args', $rowId) . ")
" . $this->dump(reset($query->args[0])) . "
" + . "" . $this->formatToggle('Result'). "
" . $this->dump($query->result) . "
" . "" . $this->prepareTrace($query->trace) . "" . ""; $cnt++; @@ -85,7 +82,7 @@ public function getPanel() return empty($this->queries) ? '' : '

Skautis

' - . '
' + . '
' . '' . '' . $s @@ -105,7 +102,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'] : "") . ")" . '
'; } - return $this->formatToggle('Trace') . "
" . $s . "
"; + return $this->formatToggle('Trace') . "
" . $s . "
"; } @@ -126,11 +123,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 "$name"; + return "$name"; } } From 73551c0b280e21229919f501c6be19d6090c7e78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mor=C3=A1vek?= Date: Thu, 5 Apr 2018 21:39:04 +0200 Subject: [PATCH 3/5] Docs update --- README.md | 4 ++-- docs/konfigurace.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 56e182d..d6b1c87 100644 --- a/README.md +++ b/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: ``` diff --git a/docs/konfigurace.md b/docs/konfigurace.md index 500944a..7162fdc 100644 --- a/docs/konfigurace.md +++ b/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) From 0c95baafa0ac843395366b70d8ce66083be98ed2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mor=C3=A1vek?= Date: Thu, 5 Apr 2018 21:41:59 +0200 Subject: [PATCH 4/5] Use Nette\SmartObject --- src/CacheAdapter.php | 2 ++ src/SessionAdapter.php | 2 ++ src/Tracy/Panel.php | 1 + 3 files changed, 5 insertions(+) diff --git a/src/CacheAdapter.php b/src/CacheAdapter.php index cdf4d04..5fd2e7d 100644 --- a/src/CacheAdapter.php +++ b/src/CacheAdapter.php @@ -14,6 +14,8 @@ class CacheAdapter implements CacheInterface { + use Nette\SmartObject; + /** @var IStorage */ private $storage; diff --git a/src/SessionAdapter.php b/src/SessionAdapter.php index 022e164..7a75ff5 100644 --- a/src/SessionAdapter.php +++ b/src/SessionAdapter.php @@ -12,6 +12,8 @@ class SessionAdapter implements AdapterInterface { + use Nette\SmartObject; + /** @var Nette\Http\SessionSection */ protected $sessionSection; diff --git a/src/Tracy/Panel.php b/src/Tracy/Panel.php index 20cf335..4d12400 100644 --- a/src/Tracy/Panel.php +++ b/src/Tracy/Panel.php @@ -15,6 +15,7 @@ */ class Panel implements Tracy\IBarPanel { + use Nette\SmartObject; /** @var array */ From 2ef950a716c32363193f9424b0d78359420a7f4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mor=C3=A1vek?= Date: Thu, 5 Apr 2018 21:44:51 +0200 Subject: [PATCH 5/5] Use PHP 5.6 features --- src/CacheAdapter.php | 4 ++-- src/SkautisExtension.php | 4 ++-- src/Tracy/Panel.php | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/CacheAdapter.php b/src/CacheAdapter.php index 5fd2e7d..c7feae8 100644 --- a/src/CacheAdapter.php +++ b/src/CacheAdapter.php @@ -97,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(); @@ -124,7 +124,7 @@ protected function generateKey($key) */ public function clean() { - $this->storage->clean(array(Cache::ALL => TRUE)); + $this->storage->clean([Cache::ALL => TRUE]); } } diff --git a/src/SkautisExtension.php b/src/SkautisExtension.php index 084ebd2..2580692 100644 --- a/src/SkautisExtension.php +++ b/src/SkautisExtension.php @@ -33,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); @@ -53,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]); } } diff --git a/src/Tracy/Panel.php b/src/Tracy/Panel.php index 4d12400..091e842 100644 --- a/src/Tracy/Panel.php +++ b/src/Tracy/Panel.php @@ -19,7 +19,7 @@ class Panel implements Tracy\IBarPanel use Nette\SmartObject; /** @var array */ - private $queries = array(); + private $queries = []; /** @@ -29,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); }
Time msFunction nameResultTrace