From c3133a792176797f254b8290335887a42fb198c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Tou=C5=A1ek?= Date: Wed, 27 Apr 2016 21:16:38 +0200 Subject: [PATCH 1/2] Update to Nette 2.3 --- composer.json | 9 ++++- src/Kdyby/Google/DI/GoogleExtension.php | 12 ------ src/Kdyby/Google/Diagnostics/Panel.php | 17 --------- src/Kdyby/Google/Google.php | 4 -- src/Kdyby/Google/IO/Curl.php | 6 +-- src/Kdyby/Google/SessionStorage.php | 1 - tests/KdybyTests/Google/Extension.phpt | 3 +- tests/KdybyTests/Google/files/config.neon | 6 +++ tests/KdybyTests/bootstrap.php | 3 +- tests/composer-nette-2.1.json | 46 ----------------------- 10 files changed, 17 insertions(+), 90 deletions(-) delete mode 100644 tests/composer-nette-2.1.json diff --git a/composer.json b/composer.json index 0dedc83..38fe544 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,11 @@ } ], "require": { - "nette/nette": "~2.1@dev", + "nette/application": "~2.3@dev", + "nette/di": "~2.3@dev", + "nette/http": "~2.3@dev", + "nette/utils": "~2.3@dev", + "tracy/tracy": "~2.3@dev", "ext-curl": "*", "ext-json": "*", @@ -29,6 +33,7 @@ }, "require-dev": { "nette/tester": "@dev", + "nette/bootstrap": "~2.3@dev", "jakub-onderka/php-parallel-lint": "~0.7" }, "support": { @@ -45,7 +50,7 @@ }, "extra": { "branch-alias": { - "dev-master": "0.1-dev" + "dev-master": "0.2-dev" } } } diff --git a/src/Kdyby/Google/DI/GoogleExtension.php b/src/Kdyby/Google/DI/GoogleExtension.php index b8879e7..cba9adc 100644 --- a/src/Kdyby/Google/DI/GoogleExtension.php +++ b/src/Kdyby/Google/DI/GoogleExtension.php @@ -184,16 +184,4 @@ protected function isPresenterName($value) return (bool) preg_match('~^(?:\\/\\/)?\\:?[a-z0-9][a-z0-9:]+$~i', $value); } - - - /** - * @param \Nette\Configurator $configurator - */ - public static function register(Nette\Configurator $configurator) - { - $configurator->onCompile[] = function ($config, Nette\DI\Compiler $compiler) { - $compiler->addExtension('google', new GoogleExtension()); - }; - } - } diff --git a/src/Kdyby/Google/Diagnostics/Panel.php b/src/Kdyby/Google/Diagnostics/Panel.php index c3dc494..caafd00 100644 --- a/src/Kdyby/Google/Diagnostics/Panel.php +++ b/src/Kdyby/Google/Diagnostics/Panel.php @@ -20,23 +20,6 @@ -if (!class_exists('Tracy\Debugger')) { - class_alias('Nette\Diagnostics\Debugger', 'Tracy\Debugger'); -} - -if (!class_exists('Tracy\Bar')) { - class_alias('Nette\Diagnostics\Bar', 'Tracy\Bar'); - class_alias('Nette\Diagnostics\BlueScreen', 'Tracy\BlueScreen'); - class_alias('Nette\Diagnostics\Helpers', 'Tracy\Helpers'); - class_alias('Nette\Diagnostics\IBarPanel', 'Tracy\IBarPanel'); -} - -if (!class_exists('Tracy\Dumper')) { - class_alias('Nette\Diagnostics\Dumper', 'Tracy\Dumper'); -} - - - /** * @author Mikulas Dite * @author Filip Procházka diff --git a/src/Kdyby/Google/Google.php b/src/Kdyby/Google/Google.php index 224ce71..be493d1 100644 --- a/src/Kdyby/Google/Google.php +++ b/src/Kdyby/Google/Google.php @@ -27,10 +27,6 @@ -if (!class_exists('Tracy\Debugger')) { - class_alias('Nette\Diagnostics\Debugger', 'Tracy\Debugger'); -} - /** * @author Mikulas Dite * @author Filip Procházka diff --git a/src/Kdyby/Google/IO/Curl.php b/src/Kdyby/Google/IO/Curl.php index f9ec7cc..5c61443 100644 --- a/src/Kdyby/Google/IO/Curl.php +++ b/src/Kdyby/Google/IO/Curl.php @@ -13,16 +13,12 @@ use Google_Exception; use Google_Http_Request; use Google_IO_Curl; -use Nette\Diagnostics\Debugger; use Nette\MemberAccessException; use Nette\Utils\ObjectMixin; +use Tracy\Debugger; -if (!class_exists('Nette\Utils\ObjectMixin')) { - class_alias('Nette\ObjectMixin', 'Nette\Utils\ObjectMixin'); -} - /** * @author Mikulas Dite * @author Filip Procházka diff --git a/src/Kdyby/Google/SessionStorage.php b/src/Kdyby/Google/SessionStorage.php index de3ed40..8cf25c9 100644 --- a/src/Kdyby/Google/SessionStorage.php +++ b/src/Kdyby/Google/SessionStorage.php @@ -11,7 +11,6 @@ namespace Kdyby\Google; use Nette; -use Nette\Diagnostics\Debugger; diff --git a/tests/KdybyTests/Google/Extension.phpt b/tests/KdybyTests/Google/Extension.phpt index 65efe85..aae9e58 100644 --- a/tests/KdybyTests/Google/Extension.phpt +++ b/tests/KdybyTests/Google/Extension.phpt @@ -33,8 +33,7 @@ class ExtensionTest extends Tester\TestCase { $config = new Nette\Configurator(); $config->setTempDirectory(TEMP_DIR); - Kdyby\Google\DI\GoogleExtension::register($config); - $config->addConfig(__DIR__ . '/files/config.neon', $config::NONE); + $config->addConfig(__DIR__ . '/files/config.neon'); return $config->createContainer(); } diff --git a/tests/KdybyTests/Google/files/config.neon b/tests/KdybyTests/Google/files/config.neon index 1cf656b..151cb2a 100644 --- a/tests/KdybyTests/Google/files/config.neon +++ b/tests/KdybyTests/Google/files/config.neon @@ -1,3 +1,9 @@ +extensions: + google: Kdyby\Google\DI\GoogleExtension + +application: + scanDirs: false + google: clientId: "93fc0e0480a89a6140e2" clientSecret: "da40b6ff5902d57f44368934" diff --git a/tests/KdybyTests/bootstrap.php b/tests/KdybyTests/bootstrap.php index 8052b9b..894d1b3 100755 --- a/tests/KdybyTests/bootstrap.php +++ b/tests/KdybyTests/bootstrap.php @@ -13,6 +13,7 @@ use Kdyby; use Nette; use Tester; +use Tracy; if (@!include __DIR__ . '/../../vendor/autoload.php') { echo 'Install Nette Tester using `composer update --dev`'; @@ -27,7 +28,7 @@ class_alias('Tester\Assert', 'Assert'); // create temporary directory define('TEMP_DIR', __DIR__ . '/../tmp/' . (isset($_SERVER['argv']) ? md5(serialize($_SERVER['argv'])) : getmypid())); Tester\Helpers::purge(TEMP_DIR); -Nette\Diagnostics\Debugger::$logDirectory = TEMP_DIR; +Tracy\Debugger::$logDirectory = TEMP_DIR; $_SERVER = array_intersect_key($_SERVER, array_flip(array( diff --git a/tests/composer-nette-2.1.json b/tests/composer-nette-2.1.json deleted file mode 100644 index 02d978a..0000000 --- a/tests/composer-nette-2.1.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "name": "kdyby/google", - "type": "library", - "description": "Google API wrapper and authentication for Nette Framework", - "keywords": ["nette", "google", "authentication", "auth", "login"], - "homepage": "http://kdyby.org", - "license": ["BSD-3-Clause", "GPL-2.0", "GPL-3.0"], - "authors": [ - { - "name": "Mikuláš Dítě", - "email": "mikulas@dite.pro" - }, - { - "name": "Filip Procházka", - "homepage": "http://filip-prochazka.com", - "email": "filip@prochazka.su" - }, - { - "name": "Google", - "homepage": "https://github.com/google/google-api-php-client/graphs/contributors" - } - ], - "require": { - "nette/nette": "2.1.*", - - "ext-curl": "*", - "ext-json": "*", - "google/apiclient": "~1.0.4@beta" - }, - "require-dev": { - "nette/tester": "@dev", - "jakub-onderka/php-parallel-lint": "~0.7" - }, - "support": { - "email": "filip@prochazka.su", - "issues": "https://github.com/kdyby/google/issues" - }, - "autoload": { - "psr-0": { - "Kdyby\\Google\\": "src/" - }, - "classmap": [ - "src/Kdyby/Google/exceptions.php" - ] - } -} From 92cf3c8cb4d49621efcc2f795059e9c6f154e7a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Kulh=C3=A1nek?= Date: Wed, 10 Jan 2018 23:36:32 +0100 Subject: [PATCH 2/2] Fix Tracy panel --- src/Kdyby/Google/Diagnostics/Panel.php | 289 ++++++++++++------------- 1 file changed, 142 insertions(+), 147 deletions(-) diff --git a/src/Kdyby/Google/Diagnostics/Panel.php b/src/Kdyby/Google/Diagnostics/Panel.php index caafd00..e139a99 100644 --- a/src/Kdyby/Google/Diagnostics/Panel.php +++ b/src/Kdyby/Google/Diagnostics/Panel.php @@ -19,7 +19,6 @@ use Tracy\IBarPanel; - /** * @author Mikulas Dite * @author Filip Procházka @@ -31,151 +30,147 @@ class Panel extends Nette\Object implements IBarPanel { - /** - * @var int logged time - */ - private $totalTime = 0; - - /** - * @var array - */ - private $calls = array(); - - /** - * @var \stdClass - */ - private $current; - - - - /** - * @return string - */ - public function getTab() - { - $img = Html::el('img')->height('16')->src('data:image/png;base64,' . base64_encode(file_get_contents(__DIR__ . '/developers-logo.png'))); - $tab = Html::el('span')->title('Google')->add($img); - $title = Html::el()->setText('Google'); - if ($this->calls) { - $title->setText( - count($this->calls) . ' call' . (count($this->calls) > 1 ? 's' : '') . - ' / ' . sprintf('%0.2f', $this->totalTime) . ' s' - ); - } - return (string) $tab->add($title); - } - - - - /** - * @return string - */ - public function getPanel() - { - if (!$this->calls) { - return NULL; - } - - ob_start(); - $esc = callback('Nette\Templating\Helpers::escapeHtml'); - $click = class_exists('\Tracy\Dumper') - ? function ($o, $c = FALSE) { - return \Tracy\Dumper::toHtml($o, array('collapse' => $c)); - } - : callback('\Tracy\Helpers::clickableDump'); - $totalTime = $this->totalTime ? sprintf('%0.3f', $this->totalTime * 1000) . ' ms' : 'none'; - - require __DIR__ . '/panel.phtml'; - return ob_get_clean(); - } - - - - public function begin(Google_Http_Request $request) - { - if ($this->current) { - return; - } - $this->calls[] = $this->current = (object) array( - 'url' => $request->getUrl(), - 'params' => $request->getQueryParams(), - 'result' => NULL, - 'exception' => NULL, - 'info' => array(), - 'time' => 0, - ); - } - - - - public function response(Google_Http_Request $request, $elapsed) - { - $this->totalTime += $this->current->time = $elapsed; - $this->current->params = $request->getQueryParams(); - $this->current->info['method'] = $request->getRequestMethod(); - } - - - - /** - * @param \Google_Http_Request $request - * @param $elapsed - */ - public function success(Google_Http_Request $request, $elapsed) - { - if (!$this->current) { - return; - } - $this->response($request, $elapsed); - try { - $result = Nette\Utils\Json::decode($request->getResponseBody()); - - } catch (Nette\Utils\JsonException $e) { - $result = $request->getResponseBody(); - } - - $this->current->result = $result; - - $this->current = NULL; - } - - - - /** - * @param Google_Http_Request $request - * @param float $elapsed - * @param Google_Exception $exception - */ - public function error(Google_Http_Request $request, $elapsed, Google_Exception $exception) - { - if (!$this->current) { - return; - } - $this->response($request, $elapsed); - $this->current->exception = $exception; - - $this->current = NULL; - } - - - - public function register(Curl $client) - { - $client->onRequest[] = $this->begin; - $client->onError[] = $this->error; - $client->onSuccess[] = $this->success; - - self::getDebuggerBar()->addPanel($this); - } - - - - /** - * @return \Tracy\Bar - */ - private static function getDebuggerBar() - { - return method_exists('Tracy\Debugger', 'getBar') ? Debugger::getBar() : Debugger::$bar; - } + /** + * @var int logged time + */ + private $totalTime = 0; + + /** + * @var array + */ + private $calls = array(); + + /** + * @var \stdClass + */ + private $current; + + + /** + * @return string + */ + public function getTab() + { + $img = Html::el('img') + ->appendAttribute('style', 'height: 16px;') + ->appendAttribute('src', 'data:image/png;base64,' . base64_encode(file_get_contents(__DIR__ . '/developers-logo.png'))); + $tab = Html::el('span') + ->appendAttribute('title','Google') + ->addHtml($img); + $title = Html::el()->setText('Google'); + if ($this->calls) { + $title->setText( + count($this->calls) . ' call' . (count($this->calls) > 1 ? 's' : '') . + ' / ' . sprintf('%0.2f', $this->totalTime) . ' s' + ); + } + return (string)$tab->addHtml($title); + } + + + /** + * @return string + */ + public function getPanel() + { + if (!$this->calls) { + return NULL; + } + + ob_start(); + $esc = callback('Nette\Templating\Helpers::escapeHtml'); + $click = class_exists('\Tracy\Dumper') + ? function ($o, $c = FALSE) { + return \Tracy\Dumper::toHtml($o, array('collapse' => $c)); + } + : callback('\Tracy\Helpers::clickableDump'); + $totalTime = $this->totalTime ? sprintf('%0.3f', $this->totalTime * 1000) . ' ms' : 'none'; + + require __DIR__ . '/panel.phtml'; + return ob_get_clean(); + } + + + public function begin(Google_Http_Request $request) + { + if ($this->current) { + return; + } + $this->calls[] = $this->current = (object)array( + 'url' => $request->getUrl(), + 'params' => $request->getQueryParams(), + 'result' => NULL, + 'exception' => NULL, + 'info' => array(), + 'time' => 0, + ); + } + + + public function response(Google_Http_Request $request, $elapsed) + { + $this->totalTime += $this->current->time = $elapsed; + $this->current->params = $request->getQueryParams(); + $this->current->info['method'] = $request->getRequestMethod(); + } + + + /** + * @param \Google_Http_Request $request + * @param $elapsed + */ + public function success(Google_Http_Request $request, $elapsed) + { + if (!$this->current) { + return; + } + $this->response($request, $elapsed); + try { + $result = Nette\Utils\Json::decode($request->getResponseBody()); + + } catch (Nette\Utils\JsonException $e) { + $result = $request->getResponseBody(); + } + + $this->current->result = $result; + + $this->current = NULL; + } + + + /** + * @param Google_Http_Request $request + * @param float $elapsed + * @param Google_Exception $exception + */ + public function error(Google_Http_Request $request, $elapsed, Google_Exception $exception) + { + if (!$this->current) { + return; + } + $this->response($request, $elapsed); + $this->current->exception = $exception; + + $this->current = NULL; + } + + + public function register(Curl $client) + { + $client->onRequest[] = $this->begin; + $client->onError[] = $this->error; + $client->onSuccess[] = $this->success; + + self::getDebuggerBar()->addPanel($this); + } + + + /** + * @return \Tracy\Bar + */ + private static function getDebuggerBar() + { + return method_exists('Tracy\Debugger', 'getBar') ? Debugger::getBar() : Debugger::$bar; + } }