Doctrine

Timestamp:

05/07/08 01:14:06 (14 months ago)

Author:

hansbrix

Message:

converted all unix newlines to PHP_EOL (was already being used in some places, caused inconsistent newline SVN errors for windows users)

Files:

• branches/0.11/lib/Doctrine/Import/Builder.php (modified) (13 diffs)

branches/0.11/lib/Doctrine/Import/Builder.php

@@ -346 +346 @@
         }
 
-        self::$_tpl =<<<END
-/**
- * This class has been auto-generated by the Doctrine ORM Framework
- */
-%sclass %s extends %s
-{
-%s
-%s
-%s
-}
-END;
+        self::$_tpl = '/**' . PHP_EOL
+                    . ' * This class has been auto-generated by the Doctrine ORM Framework' . PHP_EOL
+                    . ' */' . PHP_EOL
+                    . '%sclass %s extends %s' . PHP_EOL
+                    . '{' . PHP_EOL
+                    . '%s' . PHP_EOL
+                    . '%s' . PHP_EOL
+                    . '%s' . PHP_EOL
+                    . '}' . PHP_EOL;
     }
 
@@ -410 +408 @@
         }
         
-        $code = implode("\n", $ret);
+        $code = implode(PHP_EOL, $ret);
         $code = trim($code);
         
-        return "\n  public function setTableDefinition()"."\n  {\n    ".$code."\n  }";
+        return PHP_EOL . "  public function setTableDefinition()" . PHP_EOL . '  {' . PHP_EOL . '    ' . $code . PHP_EOL . '  }';
     }
 
@@ -488 +486 @@
                 }
             
-                $ret[$i] .= ');'."\n";
+                $ret[$i] .= ');'.PHP_EOL;
                 $i++;
             }
@@ -503 +501 @@
         }
 
-        $code = implode("\n", $ret);
+        $code = implode(PHP_EOL, $ret);
         $code = trim($code);
         
-        return "\n  public function setUp()\n  {\n    ".$code."\n  }";
+        return PHP_EOL . '  public function setUp()' . PHP_EOL . '  {' . PHP_EOL . '    ' . $code . PHP_EOL . '  }';
     }
 
@@ -544 +542 @@
             }
     
-            $build .= ");\n";
+            $build .= ');' . PHP_EOL;
         }
         
@@ -591 +589 @@
         foreach ($accessors as $name) {
             // getters
-            $ret .= "\n  public function get" . Doctrine_Inflector::classify(Doctrine_Inflector::tableize($name)) . "(\$load = true)\n";
-            $ret .= "  {\n";
-            $ret .= "    return \$this->get('{$name}', \$load);\n";
-            $ret .= "  }\n";
+            $ret .= PHP_EOL . '  public function get' . Doctrine_Inflector::classify(Doctrine_Inflector::tableize($name)) . "(\$load = true)" . PHP_EOL;
+            $ret .= "  {" . PHP_EOL;
+            $ret .= "    return \$this->get('{$name}', \$load);" . PHP_EOL;
+            $ret .= "  }" . PHP_EOL;
 
             // setters
-            $ret .= "\n  public function set" . Doctrine_Inflector::classify(Doctrine_Inflector::tableize($name)) . "(\${$name}, \$load = true)\n";
-            $ret .= "  {\n";
-            $ret .= "    return \$this->set('{$name}', \${$name}, \$load);\n";
-            $ret .= "  }\n";
+            $ret .= PHP_EOL . '  public function set' . Doctrine_Inflector::classify(Doctrine_Inflector::tableize($name)) . "(\${$name}, \$load = true)" . PHP_EOL;
+                $ret .= "  {" . PHP_EOL;
+            $ret .= "    return \$this->set('{$name}', \${$name}, \$load);" . PHP_EOL;
+            $ret .= "  }" . PHP_EOL;
         }
 
@@ -620 +618 @@
                 $optionsPhp = $this->varExport($options);
             
-                $build .= "    \$this->loadTemplate('" . $name . "', " . $optionsPhp . ");\n";
+                $build .= "    \$this->loadTemplate('" . $name . "', " . $optionsPhp . ");" . PHP_EOL;
             } else {
                 if (isset($templates[0])) {
-                    $build .= "    \$this->loadTemplate('" . $options . "');\n";
+                    $build .= "    \$this->loadTemplate('" . $options . "');" . PHP_EOL;
                 } else {
-                    $build .= "    \$this->loadTemplate('" . $name . "');\n";
+                    $build .= "    \$this->loadTemplate('" . $name . "');" . PHP_EOL;
                 }
             }
@@ -646 +644 @@
                 $optionsPhp = $this->varExport($options);
                 
-                $build .= "    \$this->actAs('" . $name . "', " . $optionsPhp . ");\n";
+                $build .= "    \$this->actAs('" . $name . "', " . $optionsPhp . ");" . PHP_EOL;
             } else {
                 if (isset($actAs[0])) {
-                    $build .= "    \$this->actAs('" . $options . "');\n";
+                    $build .= "    \$this->actAs('" . $options . "');" . PHP_EOL;
                 } else {
-                    $build .= "    \$this->actAs('" . $name . "');\n";
+                    $build .= "    \$this->actAs('" . $name . "');" . PHP_EOL;
                 }
             }
@@ -667 +665 @@
     public function buildAttributes(array $attributes)
     {
-        $build = "\n";
+        $build = PHP_EOL;
         foreach ($attributes as $key => $value) {
           
@@ -687 +685 @@
             }
             
-            $build .= "    \$this->setAttribute(Doctrine::ATTR_" . strtoupper($key) . ", " . $values . ");\n";
+            $build .= "    \$this->setAttribute(Doctrine::ATTR_" . strtoupper($key) . ", " . $values . ");" . PHP_EOL;
         }
         
@@ -703 +701 @@
         $build = '';
         foreach ($options as $name => $value) {
-            $build .= "    \$this->option('$name', " . $this->varExport($value) . ");\n";
+            $build .= "    \$this->option('$name', " . $this->varExport($value) . ");" . PHP_EOL;
         }
         
@@ -720 +718 @@
 
       foreach ($indexes as $indexName => $definitions) {
-          $build .= "\n    \$this->index('" . $indexName . "'";
+          $build .= PHP_EOL . "    \$this->index('" . $indexName . "'";
           $build .= ', ' . $this->varExport($definitions);
           $build .= ');';
@@ -946 +944 @@
 
         if (isset($definition['connection']) && $definition['connection']) {
-            $code .= "// Connection Component Binding\n";
-            $code .= "Doctrine_Manager::getInstance()->bindComponent('" . $definition['connectionClassName'] . "', '" . $definition['connection'] . "');\n";
+            $code .= "// Connection Component Binding" . PHP_EOL;
+            $code .= "Doctrine_Manager::getInstance()->bindComponent('" . $definition['connectionClassName'] . "', '" . $definition['connection'] . "');" . PHP_EOL;
         }