Home Explore Help
Sign In
boarspring
/
repo_zf1Php7
forked from boarspring/repo_zf1
2
0
Fork 0
Files
Browse Source

Remove short open tags from code generated by Zend_Tool

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@16696 44c647ce-9c0f-0410-b52a-842ac1e357ba
matthew 16 years ago
parent
1c3e613b2b
commit
83a445bcd3
4 changed files with 20 additions and 40 deletions
Split View Show Diff Stats
  1. 3 1
      library/Zend/Reflection/Docblock/Tag.php
  2. 0 17
      library/Zend/Reflection/Method.php
  3. 0 4
      library/Zend/Tool/Project/Context/Zf/HtaccessFile.php
  4. 17 18
      library/Zend/Tool/Project/Context/Zf/ViewScriptFile.php

+ 3 - 1
library/Zend/Reflection/Docblock/Tag.php
View File 

@@ -19,6 +19,9 @@
 
  * @version    $Id$
 
  */
 
 
+/** Zend_Loader */
 
+require_once 'Zend/Loader.php';
 
+
 
 /**
 
  * @category   Zend
 
  * @package    Zend_Reflection
 
@@ -64,7 +67,6 @@ class Zend_Reflection_Docblock_Tag implements Reflector
 
         if (array_key_exists($tagName, self::$_tagClasses)) {
 
             $tagClass = self::$_tagClasses[$tagName];
 
             if (!class_exists($tagClass)) {
 
-                require_once 'Zend/Loader.php';
 
                 Zend_Loader::loadClass($tagClass);
 
             }
 
             return new $tagClass($tagDocblockLine);

+ 0 - 17
library/Zend/Reflection/Method.php
View File 

@@ -122,23 +122,6 @@ class Zend_Reflection_Method extends ReflectionMethod
 
     }
 
     
     /**
 
-     * Get return type tag
 
-     *
 
-     * @return Zend_Reflection_Docblock_Tag_Return
 
-     */
 
-    public function getReturn()
 
-    {
 
-        $docblock = $this->getDocblock();
 
-        if (!$docblock->hasTag('return')) {
 
-            require_once 'Zend/Reflection/Exception.php';
 
-            throw new Zend_Reflection_Exception('Function does not specify an @return annotation tag; cannot determine return type');
 
-        }
 
-        $tag    = $docblock->getTag('return');
 
-        $return = Zend_Reflection_Docblock_Tag::factory('@return ' . $tag->getDescription());
 
-        return $return;
 
-    }
 
-    
-    /**
 
      * Get method contents
 
      *
 
      * @param  bool $includeDocblock

+ 0 - 4
library/Zend/Tool/Project/Context/Zf/HtaccessFile.php
View File 

@@ -64,10 +64,6 @@ class Zend_Tool_Project_Context_Zf_HtaccessFile extends Zend_Tool_Project_Contex
 
         $output = <<<EOS
 
 SetEnv APPLICATION_ENV development
 
 
-<IfModule mod_php5.c>
 
-    php_flag short_open_tags on
 
-</IfModule>
 
-
 
 RewriteEngine On
 
 RewriteCond %{REQUEST_FILENAME} -s [OR]
 
 RewriteCond %{REQUEST_FILENAME} -l [OR]

+ 17 - 18
library/Zend/Tool/Project/Context/Zf/ViewScriptFile.php
View File 

@@ -124,23 +124,23 @@ class Zend_Tool_Project_Context_Zf_ViewScriptFile extends Zend_Tool_Project_Cont
 
 </head>
 
 <body>
 
   <h1>An error occurred</h1>
 
-  <h2><?= \$this->message ?></h2>
 
+  <h2><?php echo \$this->message ?></h2>
 
 
-  <? if ('development' == APPLICATION_ENV): ?>
 
+  <?php if ('development' == APPLICATION_ENV): ?>
 
 
   <h3>Exception information:</h3>
 
   <p>
 
-      <b>Message:</b> <?= \$this->exception->getMessage() ?>
 
+      <b>Message:</b> <?php echo \$this->exception->getMessage() ?>
 
   </p>
 
 
   <h3>Stack trace:</h3>
 
-  <pre><?= \$this->exception->getTraceAsString() ?>
 
+  <pre><?php echo \$this->exception->getTraceAsString() ?>
 
   </pre>
 
 
   <h3>Request Parameters:</h3>
 
-  <pre><? var_dump(\$this->request->getParams()) ?>
 
+  <pre><?php echo var_export(\$this->request->getParams(), true) ?>
 
   </pre>
 
-  <? endif ?>
 
+  <?php endif ?>
 
 
 </body>
 
 </html>
 
@@ -150,7 +150,6 @@ EOS;
 
 
             $contents =<<<EOS
 
 <style>
 
-
 
     a:link,
 
     a:visited
 
     {
 
@@ -170,6 +169,7 @@ EOS;
 
         height: 400px;
 
         border: 2px solid #444444;
 
         overflow: hidden;
 
+        text-align: center;
 
     }
 
 
     div#more-information
 
@@ -177,22 +177,21 @@ EOS;
 
         background-image: url(http://framework.zend.com/images/bkg_body-bottom.gif);
 
         height: 100%;
 
     }
 
-
 
 </style>
 
-<center>
 
-    <div id="welcome">
 
-        <br />
 
-        <h1>Welcome to the <span id="zf-name">Zend Framework!</span></h1>
 
-        <h3>This is your project's main page</h3><br /><br />
 
-        <div id="more-information">
 
-            <br />
 
-            <img src="http://framework.zend.com/images/PoweredBy_ZF_4LightBG.png" /><br /><br />
 
+<div id="welcome">
 
+    <h1>Welcome to the <span id="zf-name">Zend Framework!</span></h1>
 
+
 
+    <h3>This is your project's main page</h3>
 
+
 
+    <div id="more-information">
 
+        <p><img src="http://framework.zend.com/images/PoweredBy_ZF_4LightBG.png" /></p>
 
+        <p>
 
             Helpful Links: <br />
 
             <a href="http://framework.zend.com/">Zend Framework Website</a> |
 
             <a href="http://framework.zend.com/manual/en/">Zend Framework Manual</a>
 
-        </div>
 
+        </p>
 
     </div>
 
-</center>
 
+</div>
 
 EOS;
 
 
         } else {