Code cleanup

contributte · Oct 9, 2013 · 89f77f6 · 89f77f6
1 parent c93555e
commit 89f77f6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 20 deletions.
diff --git a/src/VrtakCZ/NewRelic/Callbacks/OnRequestCallback.php b/src/VrtakCZ/NewRelic/Callbacks/OnRequestCallback.php
@@ -5,6 +5,7 @@
 use Nette\Application\Application;
 use Nette\Application\Request;
 use Nette\Application\UI\Presenter;
+use Nette\Utils\Strings;
 
 class OnRequestCallback extends \Nette\Object
 {
@@ -45,14 +46,14 @@ public function __invoke(Application $application, Request $request)
 
 		if (!empty($this->map)) {
 			foreach ($this->map as $pattern => $appName) {
-				if (\Nette\Utils\Strings::endsWith($pattern, '*')) {
-					$pattern = \Nette\Utils\Strings::substring($pattern, 0, -1);
+				if (Strings::endsWith($pattern, '*')) {
+					$pattern = Strings::substring($pattern, 0, -1);
 				}
-				if (\Nette\Utils\Strings::startsWith($pattern, ':')) {
-					$pattern = \Nette\Utils\Strings::substring($pattern, 1);
+				if (Strings::startsWith($pattern, ':')) {
+					$pattern = Strings::substring($pattern, 1);
 				}
 
-				if (\Nette\Utils\Strings::startsWith($action, $pattern)) {
+				if (Strings::startsWith($action, $pattern)) {
 					\VrtakCZ\NewRelic\Extension::setupAppName($appName, $this->license);
 				}
 			}

diff --git a/src/VrtakCZ/NewRelic/Extension.php b/src/VrtakCZ/NewRelic/Extension.php
@@ -171,18 +171,12 @@ private function setupApplicationOnRequest()
 		$map = (isset($config['appName']) && is_array($config['appName'])) ? $config['appName'] : array();
 		$license = isset($config['license']) ? $config['license'] : NULL;
 
-		$onRequestCallback = $builder->addDefinition($this->prefix('onRequestCallback'))
+		$builder->addDefinition($this->prefix('onRequestCallback'))
+			->setClass('VrtakCZ\NewRelic\Callbacks\OnRequestCallback', array(
+				$map, $license, isset($config['actionKey']) ? $config['actionKey'] : NULL,
+			))
 			->addSetup('register', array('@\Nette\Application\Application'))
-			->addTag('run', true);
-		if (isset($config['actionKey'])) {
-			$onRequestCallback->setClass('VrtakCZ\NewRelic\Callbacks\OnRequestCallback', array(
-				$map, $license, $config['actionKey'],
-			));
-		} else {
-			$onRequestCallback->setClass('VrtakCZ\NewRelic\Callbacks\OnRequestCallback', array(
-				$map, $license,
-			));
-		}
+			->addTag('run', TRUE);
 	}
 
 	private function setupApplicationOnError()
@@ -192,7 +186,7 @@ private function setupApplicationOnError()
 		$builder->addDefinition($this->prefix('onErrorCallback'))
 			->setClass('VrtakCZ\NewRelic\Callbacks\OnErrorCallback')
 			->addSetup('register', array('@\Nette\Application\Application'))
-			->addTag('run', true);
+			->addTag('run', TRUE);
 	}
 
 	private function setupCustom()
@@ -205,7 +199,7 @@ private function setupCustom()
 
 		$customParameters = $builder->addDefinition($this->prefix('custom.parameters'))
 			->setClass('VrtakCZ\NewRelic\Custom\Parameters', array($this->enabled))
-			->addTag('run', true);
+			->addTag('run', TRUE);
 
 		if (isset($config['custom']['parameters'])) {
 			if (!is_array($config['custom']['parameters'])) {
@@ -219,7 +213,7 @@ private function setupCustom()
 
 		$customTracers = $builder->addDefinition($this->prefix('custom.tracers'))
 			->setClass('VrtakCZ\NewRelic\Custom\Tracers', array($this->enabled))
-			->addTag('run', true);
+			->addTag('run', TRUE);
 
 		if (isset($config['custom']['tracers'])) {
 			if (!is_array($config['custom']['tracers'])) {
@@ -240,7 +234,7 @@ private function setupRUM()
 		$config = $this->getConfig($this->defaults);
 		$builder = $this->getContainerBuilder();
 
-		$rumEnabled = $this->enabled && true === $config['rum']['enabled'] && mt_rand(0, 99) <= round($config['rum']['ratio'] * 100) - 1;
+		$rumEnabled = $this->enabled && $config['rum']['enabled'] === TRUE && mt_rand(0, 99) <= round($config['rum']['ratio'] * 100) - 1;
 
 		$builder->addDefinition($this->prefix('rum'))
 			->setClass('Nette\DI\NestedAccessor', array('@container', $this->prefix('rum')));