瀏覽代碼

Merge remote branch 'pborreli/fixed-typos'

* pborreli/fixed-typos:
  [Various] Fixed typo
  [FrameworkBundle] Fixed css
Fabien Potencier 14 年之前
父節點
當前提交
6301728383

+ 1 - 1
src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php

@@ -264,7 +264,7 @@ class EntityChoiceList extends ArrayChoiceList
      * underlying class
      *
      * @param  string $property     The name of the property
-     * @return \ReflectionProperty  The reflection instsance
+     * @return \ReflectionProperty  The reflection instance
      */
     private function getReflProperty($property)
     {

+ 1 - 1
src/Symfony/Bundle/DoctrineBundle/CacheWarmer/ProxyCacheWarmer.php

@@ -59,7 +59,7 @@ class ProxyCacheWarmer implements CacheWarmerInterface
             throw new \RuntimeException(sprintf('Doctrine Proxy directory (%s) is not writeable for the current system user.', $proxyCacheDir));
         }
 
-        // if proxys are autogenerated we don't need to generate them in the cache warmer.
+        // if proxies are autogenerated we don't need to generate them in the cache warmer.
         if ($this->container->getParameter('doctrine.orm.auto_generate_proxy_classes') === true) {
             return;
         }

+ 1 - 1
src/Symfony/Bundle/DoctrineBundle/Command/GenerateEntitiesDoctrineCommand.php

@@ -59,7 +59,7 @@ you must provide the <comment>--path</comment> option:
 
   <info>./app/console doctrine:generate:entities Blog/Entity --path=src/</info>
 
-You should provide the <comment>--no-backup</comment> option if you dont mind to back up files
+You should provide the <comment>--no-backup</comment> option if you don't mind to back up files
 before to generate entities:
 
   <info>./app/console doctrine:generate:entities Blog/Entity --no-backup</info>

+ 2 - 2
src/Symfony/Bundle/DoctrineBundle/Command/ImportMappingDoctrineCommand.php

@@ -49,8 +49,8 @@ You can also optionally specify which entity manager to import from with the
 
 <info>./app/console doctrine:mapping:import "MyCustomBundle" xml --em=default</info>
 
-If you dont want to map every entity that can be found in the database, use the
-<info>--filter</info> option. It will try to match the targetted mapped entity with the
+If you don't want to map every entity that can be found in the database, use the
+<info>--filter</info> option. It will try to match the targeted mapped entity with the
 provided pattern string.
 
 <info>./app/console doctrine:mapping:import "MyCustomBundle" xml --filter=MyMatchedEntity</info>

+ 2 - 2
src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.html.twig

@@ -52,7 +52,7 @@
                     Logs&nbsp;
                     <a href="#" onclick="toggle('logs'); switchIcons('icon_logs_open', 'icon_logs_close'); return false;">
                         <img class="toggle" id="icon_logs_open" alt="+" src="{{ asset('bundles/framework/images/blue_picto_more.gif') }}" style="visibility: hidden" />
-                        <img class="toggle" id="icon_logs_close" alt="-" src="{{ asset('bundles/framework/images/blue_picto_less.gif') }}" style="visibility: display; margin-left: -18px" />
+                        <img class="toggle" id="icon_logs_close" alt="-" src="{{ asset('bundles/framework/images/blue_picto_less.gif') }}" style="visibility: visible; margin-left: -18px" />
                     </a>
                 </h2>
                 {% endspaceless %}
@@ -81,7 +81,7 @@
                 Content of the Output&nbsp;
                 <a href="#" onclick="toggle('output_content'); switchIcons('icon_content_open', 'icon_content_close'); return false;">
                     <img class="toggle" id="icon_content_close" alt="-" src="{{ asset('bundles/framework/images/blue_picto_less.gif') }}" style="visibility: hidden" />
-                    <img class="toggle" id="icon_content_open" alt="+" src="{{ asset('bundles/framework/images/blue_picto_more.gif') }}" style="visibility: display; margin-left: -18px" />
+                    <img class="toggle" id="icon_content_open" alt="+" src="{{ asset('bundles/framework/images/blue_picto_more.gif') }}" style="visibility: visible; margin-left: -18px" />
                 </a>
             </h2>
             {% endspaceless %}

+ 1 - 1
src/Symfony/Bundle/WebProfilerBundle/Tests/WebDebugToolbarListenerTest.php

@@ -130,7 +130,7 @@ class WebDebugToolbarListenerTest extends \PHPUnit_Framework_TestCase
     /**
      * @depends testToolbarIsInjected
      */
-    public function testToolbarIsNotInjectedOnUncompleteHtmlResponses()
+    public function testToolbarIsNotInjectedOnIncompleteHtmlResponses()
     {
         $response = new Response('<div>Some content</div>');
         $response->headers->set('X-Debug-Token', 'xxxxxxxx');

+ 1 - 1
src/Symfony/Component/DependencyInjection/ContainerBuilder.php

@@ -208,7 +208,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
     }
 
     /**
-     * Returns all Scope chilren.
+     * Returns all Scope children.
      *
      * @return array An array of scope children.
      */

+ 1 - 1
src/Symfony/Component/Form/Event/DataEvent.php

@@ -34,7 +34,7 @@ class DataEvent extends Event
     /**
      * Returns the form at the source of the event.
      * 
-     * @return FormInterafce
+     * @return FormInterface
      */
     public function getForm()
     {

+ 1 - 1
src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php

@@ -32,7 +32,7 @@ class DateTimeToArrayTransformer extends BaseDateTimeTransformer
      * @param string  $inputTimezone    The input timezone
      * @param string  $outputTimezone   The output timezone
      * @param array   $fields           The date fields
-     * @param Boolean $pad              Wether to use padding
+     * @param Boolean $pad              Whether to use padding
      *
      * @throws UnexpectedTypeException if a timezone is not a string
      */

+ 1 - 1
src/Symfony/Component/Form/Extension/Core/DataTransformer/FileToArrayTransformer.php

@@ -44,7 +44,7 @@ class FileToArrayTransformer implements DataTransformerInterface
     }
 
     /**
-     * Transfom a file internal representation to a File instance
+     * Transform a file internal representation to a File instance
      *
      * @param File $array the file representation
      *

+ 2 - 2
src/Symfony/Component/Form/FormView.php

@@ -152,7 +152,7 @@ class FormView implements \ArrayAccess, \IteratorAggregate, \Countable
     }
 
     /**
-     * Retuns whether this view has a parent.
+     * Returns whether this view has a parent.
      *
      * @return Boolean Whether this view has a parent
      */
@@ -186,7 +186,7 @@ class FormView implements \ArrayAccess, \IteratorAggregate, \Countable
     }
 
     /**
-     * Returns wether this view has children.
+     * Returns whether this view has children.
      *
      * @return Boolean Whether this view has children
      */

+ 1 - 1
src/Symfony/Component/Locale/Stub/StubCollator.php

@@ -190,7 +190,7 @@ class StubCollator
     /**
      * Get current collator's strenght
      *
-     * @return Boolean|int   The current collator's strenght or false on failure
+     * @return Boolean|int   The current collator's strength or false on failure
      * @see    http://www.php.net/manual/en/collator.getstrength.php
      * @throws MethodNotImplementedException
      */