Discussion:
[22878] standard/branches/release-1.10/library/Zend/Tool/ Framework/Client/Console/ArgumentParser.php: [ZF-9541] Zend_Tool
ramon
2010-08-21 19:59:36 UTC
Permalink
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[framework-svn][22878] standard/branches/release-1.10/library/Zend/Tool/Framework/Client/Console/ArgumentParser.php: [ZF-9541] Zend_Tool</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>22878</dd>
<dt>Author</dt> <dd>ramon</dd>
<dt>Date</dt> <dd>2010-08-21 12:59:35 -0700 (Sat, 21 Aug 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>[ZF-9541] Zend_Tool

Merged r22877 from trunk to release branch 1.10</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#standardbranchesrelease110libraryZendToolFrameworkClientConsoleArgumentParserphp">standard/branches/release-1.10/library/Zend/Tool/Framework/Client/Console/ArgumentParser.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="standardbranchesrelease110libraryZendToolFrameworkClientConsoleArgumentParserphp"></a>
<div class="modfile"><h4>Modified: standard/branches/release-1.10/library/Zend/Tool/Framework/Client/Console/ArgumentParser.php (22877 => 22878)</h4>
<pre class="diff"><span>
<span class="info">--- standard/branches/release-1.10/library/Zend/Tool/Framework/Client/Console/ArgumentParser.php 2010-08-21 19:53:14 UTC (rev 22877)
+++ standard/branches/release-1.10/library/Zend/Tool/Framework/Client/Console/ArgumentParser.php 2010-08-21 19:59:35 UTC (rev 22878)
</span><span class="lines">@@ -45,6 +45,13 @@
</span><span class="cx"> protected $_registry = null;
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Holds the manifest repository taken from the registry.
+ *
+ * @var Zend_Tool_Framework_Manifest_Repository
+ */
+ protected $_manifestRepository = null;
+
+ /** </ins><span class="cx"> * @var Zend_Tool_Framework_Client_Request </span><span class="cx"> */ </span><span class="cx"> protected $_request = null; </span><span class="lines">@@ -282,7 +289,7 @@ </span><span class="cx"> 'value' =&gt; $consoleActionName, </span><span class="cx"> 'clientName' =&gt; 'console' </span><span class="cx"> ); </span><del>- </del><ins>+ </ins><span class="cx"> // is the action name valid? </span><span class="cx"> $actionMetadata = $this-&gt;_manifestRepository-&gt;getMetadata($actionSearchCriteria); </span><span class="cx"> </span><span class="lines">@@ -293,7 +300,7 @@ </span><span class="cx"> $actionSearchCriteria['clientName'] = 'all'; </span><span class="cx"> $actionMetadata = $this-&gt;_manifestRepository-&gt;getMetadata($actionSearchCriteria); </span><span class="cx"> } </span><del>- </del><ins>+ </ins><span class="cx"> // if no action, handle error </span><span class="cx"> if (!$actionMetadata) { </span><span class="cx"> require_once 'Zend/Tool/Framework/Client/Exception.php'; </span><span class="lines">@@ -335,7 +342,7 @@ </span><span class="cx"> 'value' =&gt; $consoleProviderName, </span><span class="cx"> 'clientName' =&gt; 'console' </span><span class="cx"> ); </span><del>- </del><ins>+ </ins><span class="cx"> // get the cli provider names from the manifest </span><span class="cx"> $providerMetadata = $this-&gt;_manifestRepository-&gt;getMetadata($providerSearchCriteria); </span><span class="cx"> </span><span class="lines">@@ -346,7 +353,7 @@ </span><span class="cx"> $providerSearchCriteria['clientName'] = 'all'; </span><span class="cx"> $providerMetadata = $this-&gt;_manifestRepository-&gt;getMetadata($providerSearchCriteria); </span><span class="cx"> } </span><del>- </del><ins>+ </ins><span class="cx"> if (!$providerMetadata) { </span><span class="cx"> require_once 'Zend/Tool/Framework/Client/Exception.php'; </span><span class="cx"> throw new Zend_Tool_Framework_Client_Exception( </span><span class="lines">@@ -369,7 +376,7 @@ </span><span class="cx"> 'providerName' =&gt; $providerMetadata-&gt;getProviderName(), </span><span class="cx"> 'clientName' =&gt; 'console' </span><span class="cx"> ); </span><del>- </del><ins>+ </ins><span class="cx"> $providerSpecialtyMetadata = $this-&gt;_manifestRepository-&gt;getMetadata($providerSpecialtySearchCriteria); </span><span class="cx"> </span><span class="cx"> if (!$providerSpecialtyMetadata) { </span><span class="lines">@@ -378,7 +385,7 @@ </span><span class="cx"> $providerSpecialtySearchCriteria['clientName'] = 'all'; </span><span class="cx"> $providerSpecialtyMetadata = $this-&gt;_manifestRepository-&gt;getMetadata($providerSpecialtySearchCriteria);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if (!$providerSpecialtyMetadata) {
</span><span class="cx"> require_once 'Zend/Tool/Framework/Client/Exception.php';
</span><span class="cx"> throw new Zend_Tool_Framework_Client_Exception(
</span></span></pre>
</div>
</div>

</body>
</html>

Loading...