DTForce / nette-doctrine

src/Debug/DoctrineSQLPanel.php

Spacing +13 added lines, -14 removed lines

@@ -129,7 +129,7 @@ 
 			$params = $this->queries[$key][self::PARAMS];
 			$types = $this->queries[$key][self::TYPES];
 
-			$stmt = $this->connection->executeQuery('EXPLAIN ' . $query, $params, $types);
+			$stmt = $this->connection->executeQuery('EXPLAIN '.$query, $params, $types);
 
 			$this->queries[$key][self::EXPLAIN] = $stmt->fetchAll();
 
@@ -145,8 +145,8 @@ 
 	{
 		return '<span title="Doctrine 2">'
 		. '<img  src="data:image/png;base64,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AXilP3YAAAAHdElNRQffCxUPDinoxmA5AAABO1BMVEUAAADjcTnqakDwgzrxgz7ziDv1gz72iUD5hz35iD75iT7/gAD/gED/gEf/gID/iz25VS33hDv3iUjngzf/hT7xgTz3hj31gTz8iTv4hj7tfTr5hj77ij78iT73hj36iD37hkD8iT35hz77hz77iT73hj36hz76hz/6hz76iD79iD/2hTz7iD75hz37iD76iD77iT75hz77iT75iD78ij/6iT/6iT74hz73hj37hz33hj30hD31gDb1gjj1gjn1hDr1hDv1hTz1hT31iEP1iUP2hT32hT72hj32i0b2lVX3hTr3hj33hz73k1L3mFz3mV33ml73m1/3nGP4hjz4hz74n2X4oGf4qXf4sYL5hz76iD781bz83cr849H96dz969/+7uT+8+v+8+3+9O7+9/H++PT//Pv//v7///+xeeLXAAAAO3RSTlMAAAAAAAAAAAAAAAAAAAAAAgUGBw0QEBERFBUZHR4fKSotP0RKW15lc32GlaWsydvo6err6+z2+vv8/YuXaogAAAABYktHRGjLbPQiAAAAuklEQVQYGQXBhyIVABQA0FNkr6zsGTKzZT83e5Vsks39/y/oHFD7ZbC+HADMLU82qgRQaSpivsUHAGVtCxE37aoBRRrGI+K6B1BhZGntVyHisB8wtBOX+bq7EWfdxfjUfBPx8yHf9wrxHfTF6vHvk5fMP4UfdTAafzMzM3NzqwsG4ur56fEt837loAk6D6Kwfp75by1moMpExEXmXcTOMPB5No7yNmJ7TA3g2+Lp/vX0VyWAUjp6W/mI/zsxJP3EcQMdAAAAAElFTkSuQmCC" />'
-		. count($this->queries) . ' queries'
-		. ($this->totalTime ? ' / ' . sprintf('%0.1f', $this->totalTime * 1000) . 'ms' : '')
+		. count($this->queries).' queries'
+		. ($this->totalTime ? ' / '.sprintf('%0.1f', $this->totalTime * 1000).'ms' : '')
 		. '</span>';
 	}
 
@@ -158,36 +158,36 @@ 
 	protected function processQuery(array $query)
 	{
 		$s = '<tr>';
-		$s .= '<td>' . sprintf('%0.3f', $query[self::TIME] * 1000);
+		$s .= '<td>'.sprintf('%0.3f', $query[self::TIME] * 1000);
 
 		if ($this->doExplains && isset($query[self::EXPLAIN])) {
 			static $counter;
 			$counter++;
-			$s .= "<br /><a href='#' class='nette-toggler' rel='#nette-Doctrine2Panel-row-$counter'>" .
+			$s .= "<br /><a href='#' class='nette-toggler' rel='#nette-Doctrine2Panel-row-$counter'>".
 					"explain&nbsp;&#x25ba;</a>";
 		}
 
 		$s .= '</td>';
-		$s .= '<td class="nette-Doctrine2Panel-sql" style="min-width: 400px">' .
+		$s .= '<td class="nette-Doctrine2Panel-sql" style="min-width: 400px">'.
 				Helpers::dumpSql($query[self::SQL]);
 
 		if ($this->doExplains && isset($query[self::EXPLAIN])) {
 			$s .= "<table id='nette-Doctrine2Panel-row-$counter' class='nette-collapsed'><tr>";
 			foreach ($query[self::EXPLAIN][0] as $col => $foo) {
-				$s .= '<th>' . htmlSpecialChars($col) . '</th>';
+				$s .= '<th>'.htmlSpecialChars($col).'</th>';
 			}
 			$s .= '</tr>';
 			foreach ($query[self::EXPLAIN] as $row) {
 				$s .= '<tr>';
 				foreach ($row as $col) {
-					$s .= '<td>' . htmlSpecialChars($col) . '</td>';
+					$s .= '<td>'.htmlSpecialChars($col).'</td>';
 				}
 				$s .= '</tr>';
 			}
 			$s .= '</table>';
 		}
 		$s .= '</td>';
-		$s .= '<td>' . \Tracy\Dumper::toHtml($query[self::PARAMS]) . '</td>';
+		$s .= '<td>'.\Tracy\Dumper::toHtml($query[self::PARAMS]).'</td>';
 		$s .= '</tr>';
 
 		return $s;
@@ -215,14 +215,13 @@ 
 			$s .= $this->processQuery($query);
 		}
 
-		return empty($this->queries) ? '' :
-			$this->renderStyles() .
-			'<h1>Queries: ' . count($this->queries) .
-			($this->totalTime ? ', time: ' . sprintf('%0.3f', $this->totalTime * 1000) . ' ms' : '') .
+		return empty($this->queries) ? '' : $this->renderStyles().
+			'<h1>Queries: '.count($this->queries).
+			($this->totalTime ? ', time: '.sprintf('%0.3f', $this->totalTime * 1000).' ms' : '').
 			'</h1>
 			<div class="tracy-inner nette-Doctrine2Panel">
 			<table>
-			<tr><th>Time&nbsp;ms</th><th>SQL</th><th>Params</th></tr>' . $s . '
+			<tr><th>Time&nbsp;ms</th><th>SQL</th><th>Params</th></tr>' . $s.'
 			</table>
 			</div>';
 	}

src/DI/DoctrineExtension.php

Spacing +26 added lines, -26 removed lines

@@ -104,32 +104,32 @@ 
 		$name = $config['prefix'];
 
 
-		$builder->addDefinition($name . ".resolver")
+		$builder->addDefinition($name.".resolver")
 				->setClass('\Doctrine\ORM\Tools\ResolveTargetEntityListener');
 
-		$builder->addDefinition($name . ".naming")
+		$builder->addDefinition($name.".naming")
 				->setClass('\Doctrine\ORM\Mapping\UnderscoreNamingStrategy');
 
-		$builder->addDefinition($name . ".config")
+		$builder->addDefinition($name.".config")
 				->setClass('\Doctrine\ORM\Configuration')
 				->addSetup(new Statement('setFilterSchemaAssetsExpression', [$config['dbal']['schema_filter']]));
 
 
-		$builder->addDefinition($name . ".connection")
+		$builder->addDefinition($name.".connection")
 				->setClass('\Doctrine\DBAL\Connection')
-				->setFactory('@' . $name . '.entityManager::getConnection');
+				->setFactory('@'.$name.'.entityManager::getConnection');
 
 
-		$builder->addDefinition($name . ".entityManager")
+		$builder->addDefinition($name.".entityManager")
 				->setClass('\Doctrine\ORM\EntityManager')
 				->setFactory('\Doctrine\ORM\EntityManager::create', [
 						$config['connection'],
-						'@' . $name . '.config',
+						'@'.$name.'.config',
 						'@Doctrine\Common\EventManager'
 				]);
 
 		if ($this->hasIBarPanelInterface()) {
-			$builder->addDefinition($this->prefix($name . '.diagnosticsPanel'))
+			$builder->addDefinition($this->prefix($name.'.diagnosticsPanel'))
 					->setClass(self::DOCTRINE_SQL_PANEL_FQN);
 		}
 
@@ -145,7 +145,7 @@ 
 
 		$cache = $this->getCache($name, $builder);
 
-		$configService = $builder->getDefinition($name . ".config")
+		$configService = $builder->getDefinition($name.".config")
 				->setFactory('\Doctrine\ORM\Tools\Setup::createAnnotationMetadataConfiguration', [
 						array_values($this->entitySources),
 						$config['debug'],
@@ -153,7 +153,7 @@ 
 						$cache,
 						FALSE
 				])
-				->addSetup('setNamingStrategy', ['@' . $name . '.naming']);
+				->addSetup('setNamingStrategy', ['@'.$name.'.naming']);
 
 
 		foreach ($config['functions'] as $functionName => $function) {
@@ -168,22 +168,22 @@ 
 
 
 		foreach ($this->classMappings as $source => $target) {
-			$builder->getDefinition($name . '.resolver')
+			$builder->getDefinition($name.'.resolver')
 					->addSetup('addResolveTargetEntity', [
 							$source, $target, []
 					]);
 		}
 
-		if($this->hasEventManager($builder)) {
+		if ($this->hasEventManager($builder)) {
 			$builder->getDefinition($builder->getByType('Doctrine\Common\EventManager'))
-					->addSetup('addEventListener', [Events::loadClassMetadata, '@' . $name . '.resolver']);
+					->addSetup('addEventListener', [Events::loadClassMetadata, '@'.$name.'.resolver']);
 		} else {
-			if($config['ownEventManager']){
+			if ($config['ownEventManager']) {
 				throw new InvalidStateException("Where is your own EventManager?");
 			}
-			$builder->addDefinition($name . ".eventManager")
+			$builder->addDefinition($name.".eventManager")
 					->setClass('Doctrine\Common\EventManager')
-					->addSetup('addEventListener', [Events::loadClassMetadata, '@' . $name . '.resolver']);
+					->addSetup('addEventListener', [Events::loadClassMetadata, '@'.$name.'.resolver']);
 		}
 
 		$this->processDbalTypes($name, $config['dbal']['types']);
@@ -198,7 +198,7 @@ 
 	private function processDbalTypes($name, array $types)
 	{
 		$builder = $this->getContainerBuilder();
-		$connection = $builder->getDefinition($name . '.entityManager');
+		$connection = $builder->getDefinition($name.'.entityManager');
 
 		foreach ($types as $type => $typeSpec) {
 			if (is_array($typeSpec)) {
@@ -222,7 +222,7 @@ 
 	private function processDbalTypeOverrides($name, array $types)
 	{
 		$builder = $this->getContainerBuilder();
-		$entityManagerDefinition = $builder->getDefinition($name . '.entityManager');
+		$entityManagerDefinition = $builder->getDefinition($name.'.entityManager');
 
 		foreach ($types as $type => $className) {
 			$entityManagerDefinition->addSetup('Doctrine\DBAL\Types\Type::overrideType(?, ?);', [$type, $className]);
@@ -234,7 +234,7 @@ 
 	{
 		$initialize = $class->methods['initialize'];
 		if ($this->hasIBarPanelInterface()) {
-			$initialize->addBody('$this->getByType(\'' . self::DOCTRINE_SQL_PANEL_FQN . '\')->bindToBar();');
+			$initialize->addBody('$this->getByType(\''.self::DOCTRINE_SQL_PANEL_FQN.'\')->bindToBar();');
 		}
 	}
 
@@ -250,8 +250,8 @@ 
 
 	private function addHelpersToKdybyConsole(ContainerBuilder $builder)
 	{
-		if(class_exists(self::KDYBY_CONSOLE_EXTENSION)){
-			$helperTag = constant(self::KDYBY_CONSOLE_EXTENSION . '::HELPER_TAG');
+		if (class_exists(self::KDYBY_CONSOLE_EXTENSION)) {
+			$helperTag = constant(self::KDYBY_CONSOLE_EXTENSION.'::HELPER_TAG');
 			$builder->addDefinition($this->prefix('helper.entityManager'))
 					->setClass('Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper')
 					->addTag($helperTag, 'em');
@@ -269,13 +269,13 @@ 
 		return strlen($builder->getByType('Doctrine\Common\EventManager')) > 0;
 	}
 
-	private function getCache($prefix, ContainerBuilder $builder){
-		if(strlen($builder->getByType('Doctrine\Common\Cache\Cache')) > 0){
-			return '@' . $builder->getByType('Doctrine\Common\Cache\Cache');
+	private function getCache($prefix, ContainerBuilder $builder) {
+		if (strlen($builder->getByType('Doctrine\Common\Cache\Cache')) > 0) {
+			return '@'.$builder->getByType('Doctrine\Common\Cache\Cache');
 		} else {
-			$builder->addDefinition($prefix . ".cache")
+			$builder->addDefinition($prefix.".cache")
 				->setClass(self::DOCTRINE_DEFAULT_CACHE);
-			return '@' . $prefix . ".cache";
+			return '@'.$prefix.".cache";
 		}
 	}
 }