Merge remote-tracking branch 'origin/2.0' into 2.0

weaverryan · weaverryan · commit 7d0309010887 · 2013-02-24T16:48:51.000-08:00
diff --git a/book/installation.rst b/book/installation.rst
@@ -156,7 +156,7 @@ If there are any issues, correct them now before moving on.
 
     .. code-block:: bash
 
-        $ sudo setfacl -R -m u:www-data:rwx -m u:`whoami`:rwx app/cache app/logs
+        $ sudo setfacl -R -m u:www-data:rwX -m u:`whoami`:rwX app/cache app/logs
         $ sudo setfacl -dR -m u:www-data:rwx -m u:`whoami`:rwx app/cache app/logs
 
     **3. Without using ACL**
diff --git a/cookbook/bundles/extension.rst b/cookbook/bundles/extension.rst
@@ -293,7 +293,10 @@ configuration::
     {
         // ... prepare your $config variable
 
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader = new XmlFileLoader(
+            $container,
+            new FileLocator(__DIR__.'/../Resources/config')
+        );
         $loader->load('services.xml');
     }
 
@@ -305,7 +308,10 @@ option is passed and set to true::
     {
         // ... prepare your $config variable
 
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader = new XmlFileLoader(
+            $container,
+            new FileLocator(__DIR__.'/../Resources/config')
+        );
 
         if (isset($config['enabled']) && $config['enabled']) {
             $loader->load('services.xml');
@@ -351,14 +357,22 @@ Add the following to the ``load()`` method to do this::
     {
         // ... prepare your $config variable
 
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader = new XmlFileLoader(
+            $container,
+            new FileLocator(__DIR__.'/../Resources/config')
+        );
         $loader->load('services.xml');
 
         if (!isset($config['my_type'])) {
-            throw new \InvalidArgumentException('The "my_type" option must be set');
+            throw new \InvalidArgumentException(
+                'The "my_type" option must be set'
+            );
         }
 
-        $container->setParameter('acme_hello.my_service_type', $config['my_type']);
+        $container->setParameter(
+            'acme_hello.my_service_type',
+            $config['my_type']
+        );
     }
 
 Now, the user can effectively configure the service by specifying the ``my_type``
diff --git a/cookbook/email/testing.rst b/cookbook/email/testing.rst
@@ -56,8 +56,11 @@ to get information about the messages send on the previous request::
             $this->assertEquals('Hello Email', $message->getSubject());
             $this->assertEquals('send@example.com', key($message->getFrom()));
             $this->assertEquals('recipient@example.com', key($message->getTo()));
-            $this->assertEquals('You should see me from the profiler!', $message->getBody());
+            $this->assertEquals(
+                'You should see me from the profiler!',
+                $message->getBody()
+            );
         }
     }
 
-.. _Swiftmailer: http://swiftmailer.org/
+.. _Swiftmailer: http://swiftmailer.org/
diff --git a/cookbook/security/entity_provider.rst b/cookbook/security/entity_provider.rst
@@ -377,7 +377,11 @@ The code below shows the implementation of the
                 // if there is no record matching the criteria.
                 $user = $q->getSingleResult();
             } catch (NoResultException $e) {
-                throw new UsernameNotFoundException(sprintf('Unable to find an active admin AcmeUserBundle:User object identified by "%s".', $username), null, 0, $e);
+                $message = sprintf(
+                    'Unable to find an active admin AcmeUserBundle:User object identified by "%s".',
+                    $username
+                );
+                throw new UsernameNotFoundException($message, null, 0, $e);
             }
 
             return $user;
@@ -387,15 +391,21 @@ The code below shows the implementation of the
         {
             $class = get_class($user);
             if (!$this->supportsClass($class)) {
-                throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', $class));
+                throw new UnsupportedUserException(
+                    sprintf(
+                        'Instances of "%s" are not supported.',
+                        $class
+                    )
+                );
             }
 
             return $this->find($user->getId());
         }
 
         public function supportsClass($class)
         {
-            return $this->getEntityName() === $class || is_subclass_of($class, $this->getEntityName());
+            return $this->getEntityName() === $class
+                || is_subclass_of($class, $this->getEntityName());
         }
     }
 
diff --git a/cookbook/service_container/event_listener.rst b/cookbook/service_container/event_listener.rst
@@ -27,7 +27,11 @@ event is just one of the core kernel events::
         {
             // You get the exception object from the received event
             $exception = $event->getException();
-            $message = 'My Error says: ' . $exception->getMessage() . ' with code: ' . $exception->getCode();
+            $message = sprintf(
+                'My Error says: %s with code: %s',
+                $exception->getMessage(),
+                $exception->getCode()
+            );
 
             // Customize your response object to display the exception details
             $response = new Response();

Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,11 @@ to get information about the messages send on the previous request::`
`56`	`56`	`$this->assertEquals('Hello Email', $message->getSubject());`
`57`	`57`	`$this->assertEquals('send@example.com', key($message->getFrom()));`
`58`	`58`	`$this->assertEquals('recipient@example.com', key($message->getTo()));`
`59`		`- $this->assertEquals('You should see me from the profiler!', $message->getBody());`
	`59`	`+ $this->assertEquals(`
	`60`	`+ 'You should see me from the profiler!',`
	`61`	`+ $message->getBody()`
	`62`	`+ );`
`60`	`63`	`}`
`61`	`64`	`}`
`62`	`65`
`63`		`-.. _Swiftmailer: http://swiftmailer.org/`
	`66`	`+.. _Swiftmailer: http://swiftmailer.org/`
Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,11 @@ The code below shows the implementation of the`
`377`	`377`	`// if there is no record matching the criteria.`
`378`	`378`	`$user = $q->getSingleResult();`
`379`	`379`	`} catch (NoResultException $e) {`
`380`		`- throw new UsernameNotFoundException(sprintf('Unable to find an active admin AcmeUserBundle:User object identified by "%s".', $username), null, 0, $e);`
	`380`	`+ $message = sprintf(`
	`381`	`+ 'Unable to find an active admin AcmeUserBundle:User object identified by "%s".',`
	`382`	`+ $username`
	`383`	`+ );`
	`384`	`+ throw new UsernameNotFoundException($message, null, 0, $e);`
`381`	`385`	`}`
`382`	`386`
`383`	`387`	`return $user;`
`@@ -387,15 +391,21 @@ The code below shows the implementation of the`
`387`	`391`	`{`
`388`	`392`	`$class = get_class($user);`
`389`	`393`	`if (!$this->supportsClass($class)) {`
`390`		`- throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', $class));`
	`394`	`+ throw new UnsupportedUserException(`
	`395`	`+ sprintf(`
	`396`	`+ 'Instances of "%s" are not supported.',`
	`397`	`+ $class`
	`398`	`+ )`
	`399`	`+ );`
`391`	`400`	`}`
`392`	`401`
`393`	`402`	`return $this->find($user->getId());`
`394`	`403`	`}`
`395`	`404`
`396`	`405`	`public function supportsClass($class)`
`397`	`406`	`{`
`398`		`- return $this->getEntityName() === $class \|\| is_subclass_of($class, $this->getEntityName());`
	`407`	`+ return $this->getEntityName() === $class`
	`408`	`+ \|\| is_subclass_of($class, $this->getEntityName());`
`399`	`409`	`}`
`400`	`410`	`}`
`401`	`411`