Skip to content

Commit

Permalink
Merge pull request #611 from gszy/zdt-to-laminas
Browse files Browse the repository at this point in the history
Fix old Zend Developer Tools CSS class names
  • Loading branch information
TomHAnderson authored Feb 19, 2020
2 parents 5c7c160 + 6bfe3db commit 5456f15
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 38 deletions.
2 changes: 1 addition & 1 deletion test/DoctrineORMModuleTest/Assets/GraphEntity/Address.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use Doctrine\Common\Collections\ArrayCollection;

/**
* Part of the test assets used to produce a demo of graphs in the ZDT integration
* Part of the test assets used to produce a demo of graphs in the Laminas Developer Tools integration
*
* @license MIT
* @link http://www.doctrine-project.org/
Expand Down
2 changes: 1 addition & 1 deletion test/DoctrineORMModuleTest/Assets/GraphEntity/Session.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use Doctrine\ORM\Mapping as ORM;

/**
* Part of the test assets used to produce a demo of graphs in the ZDT integration
* Part of the test assets used to produce a demo of graphs in the Laminas Developer Tools integration
*
* @license MIT
* @link http://www.doctrine-project.org/
Expand Down
2 changes: 1 addition & 1 deletion test/DoctrineORMModuleTest/Assets/GraphEntity/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use Doctrine\Common\Collections\ArrayCollection;

/**
* Part of the test assets used to produce a demo of graphs in the ZDT integration
* Part of the test assets used to produce a demo of graphs in the Laminas Developer Tools integration
*
* @license MIT
* @link http://www.doctrine-project.org/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use Doctrine\Common\Collections\ArrayCollection;

/**
* Part of the test assets used to produce a demo of graphs in the ZDT integration
* Part of the test assets used to produce a demo of graphs in the Laminas Developer Tools integration
*
* @license MIT
* @link http://www.doctrine-project.org/
Expand Down
28 changes: 14 additions & 14 deletions view/laminas-developer-tools/toolbar/doctrine-orm-mappings.phtml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?php /* @var $collector \DoctrineORMModule\Collector\MappingCollector */ ?>
<div class="zdt-toolbar-entry">
<div class="zdt-toolbar-preview">
<div class="laminas-toolbar-entry">
<div class="laminas-toolbar-preview">
<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAaCAYAAAC3g3x9AAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH3AwOFjIRE2xHhwAAAvZJREFUSMedlF9oVnUYxz/P77zzzRmruYELGhh48Qor3026sOlFUFHrQmMuvXAQZrS9r+DawkVSeCPsItmibbB3zMKSFBGLJcIuhnazaM2tZjRRr15LcP3BomKdc35PFxs7O2fnde92Lp/z/D6/7/N9nt8jRD7NPF3l4w0BO0CnHJFj0jc5RpGfiQZ8vB6gASgHedZX+drNpJ9ZM1BhWySSEGTEzaafXxNQ0NGYvA2iMuy1pvesGugk3feAWzG5SUTOetn07tUp7P7xd2d2Swo4FQtVueBlal8vGggg58/71nF6VfkGxIsWAeS8bPpQ7NllTTm8PeX7tgfhhbj/ocPCgNM32VIQuFDKR8D64oZEVeCM0z/VvKxkP5M+AgwuhUl1CtPSg2nsgMS6WI2KHPBbaztDCt3M9p2CvbLgT2Dw258gTzw1ryU/gz35Grj/xUm1in2ppP/7EaMgYHNRGAB//UFI7cEuSJQUaK7p1aYmR9xM3YuCXo616JFKTPsQUlkduPbTGHagHdy5OEtfNYLuLej5/V+xJ/ajN8YDpVt3YFq6oSQZo1P2iJ+pm1a0Zn5sS5HnmpGKx+H+bJC4fgNS3wgmGFvNz2C734C5v5cif0ko+tjiBa+0Ibv2FjUwUp3C7OvEnn5/aXiTCTUjfFsRY2iXhRICeYVHAexwP/LzbSh9GP78LcgqLcM0tsO6YN71zgz2XFeUdy+hwjTKk/NPxUW//SqcUlaB0zYYhk2NYk+9A370mcs1g8qFgiVtrMIc/RQ2bQ5g45exQ0djYAD2S+N4MgzkY6d137tIeVUA++Eq9rPjYG1c+l3Hc84YyU24qLbGKizbGMBufocd7ADPLdAgOSa5iX8Wt42bre0SpTPkyOYapOFNmM1jv/gw/nUAiH6c6Js6GFpfCuJlaz8Q5a2V9mAElnNc57DkJtzYBetl0w2qclIgtQIqD3Qm+ic/f+DGBtDjGP9e3cugDQL1CpUISVHuqHAd5aKTfOiSdI/9Gz37P6crCTosFB7sAAAAAElFTkSuQmCC" alt="Doctrine ORM (Mappings)">
<span class="zdt-toolbar-info">
<span class="laminas-toolbar-info">
<?php echo count($collector->getClasses()); ?>
mappings
</span>
</div>
<div class="zdt-toolbar-detail">
<span class="zdt-toolbar-info zdt-toolbar-info-heading">
<div class="laminas-toolbar-detail">
<span class="laminas-toolbar-info laminas-toolbar-info-heading">
<a href="https://github.com/doctrine/DoctrineORMModule" target="_blank">
DoctrineORMModule
</a>
</span>
<span class="zdt-toolbar-info zdt-toolbar-info-heading">
<span class="laminas-toolbar-info laminas-toolbar-info-heading">
Mappings for
<span class="ddt-toolbar-info"><?php echo $this->escapeHtml($collector->getName()); ?></span>
</span>
Expand All @@ -23,46 +23,46 @@
$graph = $grapher->generateFromMetadata($collector->getClasses());
?>
<input type="hidden" name="dsl_text" value="<?php echo $this->escapeHtmlAttr($graph); ?>"/>
<span class="zdt-toolbar-info zdt-toolbar-info-heading">
<span class="laminas-toolbar-info laminas-toolbar-info-heading">
<input type="submit" value="Dependency Graph"/>
</span>
</form>
<span class="zdt-toolbar-info ddt-toolbar-info">
<span class="laminas-toolbar-info ddt-toolbar-info">
<?php foreach ($collector->getClasses() as $class): ?>
<span class="zdt-detail-value"><?php echo $this->escapeHtml($class->getName()); ?></span>
<span class="laminas-detail-value"><?php echo $this->escapeHtml($class->getName()); ?></span>
<br/>
<?php endforeach ?>
</span>
</div>
</div>
<style>
.zdt-toolbar-entry .zdt-toolbar-detail .ddt-toolbar-info {
.laminas-toolbar-entry .laminas-toolbar-detail .ddt-toolbar-info {
font-size: 11px;
max-width: 600px;
max-height: 300px !important;
overflow-y: auto !important;
overflow-x: hidden;
}

.zdt-toolbar-entry .zdt-toolbar-detail .ddt-detail-query {
.laminas-toolbar-entry .laminas-toolbar-detail .ddt-detail-query {

white-space: normal;
width: 400px;
}

.zdt-toolbar-entry .zdt-toolbar-detail .ddt-detail-query .highlight {
.laminas-toolbar-entry .laminas-toolbar-detail .ddt-detail-query .highlight {

color: #80DC09;
font-weight: bold;
}

.zdt-toolbar-entry .zdt-toolbar-info .clear {
.laminas-toolbar-entry .laminas-toolbar-info .clear {

clear: both;
display: block;
}

.zdt-toolbar-entry .zdt-toolbar-detail .ddt-toolbar-info hr {
.laminas-toolbar-entry .laminas-toolbar-detail .ddt-toolbar-info hr {

border: 0;
border-top: 1px solid #80DC09;
Expand Down
40 changes: 20 additions & 20 deletions view/laminas-developer-tools/toolbar/doctrine-orm-queries.phtml
Original file line number Diff line number Diff line change
@@ -1,82 +1,82 @@
<?php /* @var $collector \DoctrineORMModule\Collector\SQLLoggerCollector */ ?>
<div class="zdt-toolbar-entry">
<div class="zdt-toolbar-preview">
<div class="laminas-toolbar-entry">
<div class="laminas-toolbar-preview">
<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAaCAYAAAC3g3x9AAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH3AwOFjIRE2xHhwAAAvZJREFUSMedlF9oVnUYxz/P77zzzRmruYELGhh48Qor3026sOlFUFHrQmMuvXAQZrS9r+DawkVSeCPsItmibbB3zMKSFBGLJcIuhnazaM2tZjRRr15LcP3BomKdc35PFxs7O2fnde92Lp/z/D6/7/N9nt8jRD7NPF3l4w0BO0CnHJFj0jc5RpGfiQZ8vB6gASgHedZX+drNpJ9ZM1BhWySSEGTEzaafXxNQ0NGYvA2iMuy1pvesGugk3feAWzG5SUTOetn07tUp7P7xd2d2Swo4FQtVueBlal8vGggg58/71nF6VfkGxIsWAeS8bPpQ7NllTTm8PeX7tgfhhbj/ocPCgNM32VIQuFDKR8D64oZEVeCM0z/VvKxkP5M+AgwuhUl1CtPSg2nsgMS6WI2KHPBbaztDCt3M9p2CvbLgT2Dw258gTzw1ryU/gz35Grj/xUm1in2ppP/7EaMgYHNRGAB//UFI7cEuSJQUaK7p1aYmR9xM3YuCXo616JFKTPsQUlkduPbTGHagHdy5OEtfNYLuLej5/V+xJ/ajN8YDpVt3YFq6oSQZo1P2iJ+pm1a0Zn5sS5HnmpGKx+H+bJC4fgNS3wgmGFvNz2C734C5v5cif0ko+tjiBa+0Ibv2FjUwUp3C7OvEnn5/aXiTCTUjfFsRY2iXhRICeYVHAexwP/LzbSh9GP78LcgqLcM0tsO6YN71zgz2XFeUdy+hwjTKk/NPxUW//SqcUlaB0zYYhk2NYk+9A370mcs1g8qFgiVtrMIc/RQ2bQ5g45exQ0djYAD2S+N4MgzkY6d137tIeVUA++Eq9rPjYG1c+l3Hc84YyU24qLbGKizbGMBufocd7ADPLdAgOSa5iX8Wt42bre0SpTPkyOYapOFNmM1jv/gw/nUAiH6c6Js6GFpfCuJlaz8Q5a2V9mAElnNc57DkJtzYBetl0w2qclIgtQIqD3Qm+ic/f+DGBtDjGP9e3cugDQL1CpUISVHuqHAd5aKTfOiSdI/9Gz37P6crCTosFB7sAAAAAElFTkSuQmCC" alt="Doctrine ORM (Queries)">
<span class="zdt-toolbar-info">
<span class="laminas-toolbar-info">
<?php echo $collector->getQueryCount(); ?>
queries in
<?php echo $this->LaminasDeveloperToolsTime($collector->getQueryTime()); ?>
</span>
</div>
<div class="zdt-toolbar-detail">
<span class="zdt-toolbar-info zdt-toolbar-info-heading">
<div class="laminas-toolbar-detail">
<span class="laminas-toolbar-info laminas-toolbar-info-heading">
<a href="https://github.com/doctrine/DoctrineORMModule" target="_blank">
DoctrineORMModule
</a>
</span>
<span class="zdt-toolbar-info zdt-toolbar-info-heading">
<span class="laminas-toolbar-info laminas-toolbar-info-heading">
Queries for
<span class="ddt-toolbar-info"> <?php echo $collector->getName() ?></span>
</span>
<span class="zdt-toolbar-info ddt-toolbar-info">
<span class="laminas-toolbar-info ddt-toolbar-info">
<?php foreach ($collector->getQueries() as $query): ?>
<hr/>
<span class="zdt-detail-label">SQL</span>
<span class="zdt-detail-value ddt-detail-query ddt-detail-value">
<span class="laminas-detail-label">SQL</span>
<span class="laminas-detail-value ddt-detail-query ddt-detail-value">
<?php /* highlight UPPERCASE words in the query, which should mostly match SQL keywords */ ?>
<?php echo preg_replace('/\b([A-Z]+)\b/', '<span class="highlight">$1</span>', $this->escapeHtml($query['sql'])) ?>
</span>
<span class="clear"></span>
<span class="zdt-detail-label">Params</span>
<span class="zdt-detail-value ddt-detail-value">
<span class="laminas-detail-label">Params</span>
<span class="laminas-detail-value ddt-detail-value">
<?php if (isset($query['params']) && is_array($query['params'])): ?>
<?php foreach($query['params'] as $key => $value): ?>
&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $key ?> => <?php \Doctrine\Common\Util\Debug::dump($value) ?><br/>
<?php endforeach ?>
<?php endif ?>
</span>
<span class="clear"></span>
<span class="zdt-detail-label">Types</span>
<span class="zdt-detail-value ddt-detail-value">
<span class="laminas-detail-label">Types</span>
<span class="laminas-detail-value ddt-detail-value">
<?php if (isset($query['types']) && is_array($query['types'])): ?>
<?php foreach($query['types'] as $key => $value): ?>
&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $key ?> => <?php \Doctrine\Common\Util\Debug::dump($value) ?><br/>
<?php endforeach ?>
<?php endif ?>
</span>
<span class="clear"></span>
<span class="zdt-detail-label">Time</span>
<span class="zdt-detail-value ddt-detail-value"><?php echo $query['executionMS'] ?></span>
<span class="laminas-detail-label">Time</span>
<span class="laminas-detail-value ddt-detail-value"><?php echo $query['executionMS'] ?></span>
<span class="clear"></span>
<?php endforeach ?>
</span>
</div>
</div>
<style>
.zdt-toolbar-entry .zdt-toolbar-detail .ddt-toolbar-info {
.laminas-toolbar-entry .laminas-toolbar-detail .ddt-toolbar-info {
font-size: 11px;
max-width: 600px;
max-height: 300px !important;
overflow-y: auto !important;
overflow-x: hidden;
}

.zdt-toolbar-entry .zdt-toolbar-detail .ddt-detail-query {
.laminas-toolbar-entry .laminas-toolbar-detail .ddt-detail-query {
white-space: normal;
width: 400px;
}

.zdt-toolbar-entry .zdt-toolbar-detail .ddt-detail-query .highlight {
.laminas-toolbar-entry .laminas-toolbar-detail .ddt-detail-query .highlight {
color: #80DC09;
font-weight: bold;
}

.zdt-toolbar-entry .zdt-toolbar-info .clear {
.laminas-toolbar-entry .laminas-toolbar-info .clear {
clear: both;
display: block;
}

.zdt-toolbar-entry .zdt-toolbar-detail .ddt-toolbar-info hr {
.laminas-toolbar-entry .laminas-toolbar-detail .ddt-toolbar-info hr {
border: 0;
border-top: 1px solid #80DC09;
clear: both;
Expand Down

0 comments on commit 5456f15

Please sign in to comment.