Merge pull request cakephp#923 from Ayb3x/fix-code-line-overflows-pgs…

…-101-200 Fix code line overflows pgs 101-200
kp2356 · Dec 5, 2013 · eb04bce · eb04bce
2 parents 2c406a5 + 7ef9f51
commit eb04bce
Show file tree

Hide file tree

Showing 9 changed files with 255 additions and 92 deletions.
diff --git a/en/controllers/components.rst b/en/controllers/components.rst
@@ -33,7 +33,10 @@ method::
         public $components = array(
             'Auth' => array(
                 'authorize' => array('controller'),
-                'loginAction' => array('controller' => 'users', 'action' => 'login')
+                'loginAction' => array(
+                    'controller' => 'users',
+                    'action' => 'login'
+                )
             ),
             'Cookie' => array('name' => 'CookieMonster')
         );
@@ -49,7 +52,10 @@ as::
 
     public function beforeFilter() {
         $this->Auth->authorize = array('controller');
-        $this->Auth->loginAction = array('controller' => 'users', 'action' => 'login');
+        $this->Auth->loginAction = array(
+            'controller' => 'users',
+            'action' => 'login'
+        );
 
         $this->Cookie->name = 'CookieMonster';
     }
@@ -105,7 +111,7 @@ them like so::
 
     class PostsController extends AppController {
         public $components = array('Session', 'Cookie');
-        
+
         public function delete() {
             if ($this->Post->delete($this->request->data('Post.id')) {
                 $this->Session->setFlash('Post deleted.');

diff --git a/en/core-libraries/components/access-control-lists.rst b/en/core-libraries/components/access-control-lists.rst
@@ -798,8 +798,16 @@ yourself. What we have above is equivalent to this:
     // 6342 = Legolas
     // 1564 = Gimli
 
-    $this->Acl->deny(array('model' => 'User', 'foreign_key' => 6342), 'Weapons', 'delete');
-    $this->Acl->deny(array('model' => 'User', 'foreign_key' => 1564), 'Weapons', 'delete');
+    $this->Acl->deny(
+      array('model' => 'User', 'foreign_key' => 6342),
+      'Weapons',
+      'delete'
+    );
+    $this->Acl->deny(
+      array('model' => 'User', 'foreign_key' => 1564),
+      'Weapons',
+      'delete'
+    );
 
 .. note::
 

diff --git a/en/core-libraries/components/request-handling.rst b/en/core-libraries/components/request-handling.rst
@@ -49,12 +49,14 @@ the client and its request.
 
             public function beforeFilter() {
                 if ($this->RequestHandler->accepts('html')) {
-                    // Execute code only if client accepts an HTML (text/html) response
+                    // Execute code only if client accepts an HTML (text/html)
+                    // response
                 } elseif ($this->RequestHandler->accepts('xml')) {
                     // Execute XML-only code
                 }
                 if ($this->RequestHandler->accepts(array('xml', 'rss', 'atom'))) {
-                    // Executes if the client accepts any of the above: XML, RSS or Atom
+                    // Executes if the client accepts any of the above: XML, RSS
+                    // or Atom
                 }
             }
         }

diff --git a/en/core-libraries/helpers/form.rst b/en/core-libraries/helpers/form.rst
@@ -77,7 +77,8 @@ opening form tag.
         }
 
         // View/Recipes/edit.ctp:
-        // Since $this->request->data['Recipe']['id'] = 5, we will get an edit form
+        // Since $this->request->data['Recipe']['id'] = 5,
+        // we will get an edit form
         <?php echo $this->Form->create('Recipe'); ?>
 
     Output:
@@ -139,7 +140,8 @@ There are a number of options for create():
 
   .. code-block:: html
 
-     <form id="UserAddForm" enctype="multipart/form-data" method="post" action="/users/add">
+     <form id="UserAddForm" enctype="multipart/form-data"
+        method="post" action="/users/add">
 
   When using 'put' or 'delete', your form will be functionally
   equivalent to a 'post' form, but when submitted, the HTTP request
@@ -213,7 +215,11 @@ There are a number of options for create():
   defaultOptions by declaring the option in the input() call::
 
     echo $this->Form->input('password'); // No div, no label
-    echo $this->Form->input('username', array('label' => 'Username')); // has a label element
+    // has a label element
+    echo $this->Form->input(
+        'username',
+        array('label' => 'Username')
+    );
 
 Closing the Form
 ================
@@ -262,7 +268,8 @@ Closing the Form
 
     .. code-block:: html
 
-        <div class="glass-pill"><input type="submit" value="Update" name="Update"></div>
+        <div class="glass-pill"><input type="submit" value="Update" name="Update">
+        </div>
 
     See the `API <http://api20.cakephp.org>`_ for further details.
 
@@ -342,7 +349,8 @@ field. Internally ``input()`` delegates to other methods in FormHelper.
 
         echo $this->Form->input('username');   //text
         echo $this->Form->input('password');   //password
-        echo $this->Form->input('approved');   //day, month, year, hour, minute, meridian
+        echo $this->Form->input('approved');   //day, month, year, hour, minute,
+                                               //meridian
         echo $this->Form->input('quote');      //textarea
 
         echo $this->Form->end('Add');
@@ -389,7 +397,10 @@ field. Internally ``input()`` delegates to other methods in FormHelper.
 
         $this->set('userGroups', $this->UserGroup->find('list'));
         // or
-        $this->set('reallyInappropriateModelNames', $this->ReallyInappropriateModelName->find('list'));
+        $this->set(
+            'reallyInappropriateModelNames',
+            $this->ReallyInappropriateModelName->find('list')
+        );
 
     .. note::
 
@@ -447,8 +458,10 @@ Output:
 
 .. code-block:: html
 
-    <input type="text" id="Modelname0Fieldname" name="data[Modelname][0][fieldname]">
-    <input type="text" id="Modelname1Fieldname" name="data[Modelname][1][fieldname]">
+    <input type="text" id="Modelname0Fieldname"
+        name="data[Modelname][0][fieldname]">
+    <input type="text" id="Modelname1Fieldname"
+        name="data[Modelname][1][fieldname]">
 
 
 FormHelper uses several field-suffixes internally for datetime input creation.
@@ -525,7 +538,8 @@ HTML attributes. The following will cover the options specific to
 
   .. code-block:: html
 
-    <div class="input text" id="mainDiv" title="Div Title" style="display:block">
+    <div class="input text" id="mainDiv" title="Div Title"
+        style="display:block">
         <label for="UserName">Name</label>
         <input name="data[User][name]" type="text" value="" id="UserName" />
     </div>
@@ -609,7 +623,9 @@ HTML attributes. The following will cover the options specific to
   following format::
 
     $this->Form->input('Model.field', array(
-        'error' => array('attributes' => array('wrap' => 'span', 'class' => 'bzzz'))
+        'error' => array(
+            'attributes' => array('wrap' => 'span', 'class' => 'bzzz')
+        )
     ));
 
   To prevent HTML being automatically escaped in the error message
@@ -755,7 +771,10 @@ common options shared by all input methods are as follows:
   default)::
 
     $sizes = array('s' => 'Small', 'm' => 'Medium', 'l' => 'Large');
-    echo $this->Form->input('size', array('options' => $sizes, 'default' => 'm'));
+    echo $this->Form->input(
+        'size',
+        array('options' => $sizes, 'default' => 'm')
+    );
 
   .. note::
 
@@ -833,8 +852,10 @@ Options for select, checkbox and  radio inputs
 
   .. code-block:: html
 
-    <input type="hidden" name="data[Post][Published]" id="PostPublished_" value="0" />
-    <input type="checkbox" name="data[Post][Published]" value="1" id="PostPublished" />
+    <input type="hidden" name="data[Post][Published]" id="PostPublished_"
+        value="0" />
+    <input type="checkbox" name="data[Post][Published]" value="1"
+        id="PostPublished" />
 
   This can be disabled by setting the ``$options['hiddenField'] = false``::
 
@@ -844,7 +865,8 @@ Options for select, checkbox and  radio inputs
 
   .. code-block:: html
 
-    <input type="checkbox" name="data[Post][Published]" value="1" id="PostPublished" />
+    <input type="checkbox" name="data[Post][Published]" value="1"
+        id="PostPublished" />
 
   If you want to create multiple blocks of inputs on a form that are
   all grouped together, you should use this parameter on all inputs
@@ -858,20 +880,26 @@ Options for select, checkbox and  radio inputs
 
     <h2>Primary Colors</h2>
     <input type="hidden" name="data[Color][Color]" id="Colors_" value="0" />
-    <input type="checkbox" name="data[Color][Color][]" value="5" id="ColorsRed" />
+    <input type="checkbox" name="data[Color][Color][]" value="5"
+        id="ColorsRed" />
     <label for="ColorsRed">Red</label>
-    <input type="checkbox" name="data[Color][Color][]" value="5" id="ColorsBlue" />
+    <input type="checkbox" name="data[Color][Color][]" value="5"
+        id="ColorsBlue" />
     <label for="ColorsBlue">Blue</label>
-    <input type="checkbox" name="data[Color][Color][]" value="5" id="ColorsYellow" />
+    <input type="checkbox" name="data[Color][Color][]" value="5"
+        id="ColorsYellow" />
     <label for="ColorsYellow">Yellow</label>
 
     <h2>Tertiary Colors</h2>
     <input type="hidden" name="data[Color][Color]" id="Colors_" value="0" />
-    <input type="checkbox" name="data[Color][Color][]" value="5" id="ColorsGreen" />
+    <input type="checkbox" name="data[Color][Color][]" value="5"
+        id="ColorsGreen" />
     <label for="ColorsGreen">Green</label>
-    <input type="checkbox" name="data[Color][Color][]" value="5" id="ColorsPurple" />
+    <input type="checkbox" name="data[Color][Color][]" value="5"
+        id="ColorsPurple" />
     <label for="ColorsPurple">Purple</label>
-    <input type="checkbox" name="data[Addon][Addon][]" value="5" id="ColorsOrange" />
+    <input type="checkbox" name="data[Addon][Addon][]" value="5"
+        id="ColorsOrange" />
     <label for="ColorsOrange">Orange</label>
 
   Disabling the ``'hiddenField'`` on the second input group would
@@ -965,7 +993,8 @@ Form Element-Specific Methods
 
     .. code-block:: html
 
-        <input name="data[User][username]" type="text" class="users" id="UserUsername" />
+        <input name="data[User][username]" type="text" class="users"
+            id="UserUsername" />
 
 .. php:method:: password(string $fieldName, array $options)
 
@@ -977,7 +1006,8 @@ Form Element-Specific Methods
 
     .. code-block:: html
 
-        <input name="data[User][password]" value="" id="UserPassword" type="password" />
+        <input name="data[User][password]" value="" id="UserPassword"
+            type="password" />
 
 .. php:method:: hidden(string $fieldName, array $options)
 
@@ -1018,7 +1048,10 @@ Form Element-Specific Methods
 
         echo $this->Form->textarea('notes', array('escape' => false);
         // OR....
-        echo $this->Form->input('notes', array('type' => 'textarea', 'escape' => false);
+        echo $this->Form->input(
+            'notes',
+            array('type' => 'textarea', 'escape' => false)
+        );
 
 
     **Options**
@@ -1029,7 +1062,10 @@ Form Element-Specific Methods
     * ``$options['rows'], $options['cols']`` These two keys specify the number of
       rows and columns::
 
-        echo $this->Form->textarea('textarea', array('rows' => '5', 'cols' => '5'));
+        echo $this->Form->textarea(
+            'textarea',
+            array('rows' => '5', 'cols' => '5')
+        );
 
       Output:
 
@@ -1105,10 +1141,13 @@ Form Element-Specific Methods
 
       .. code-block:: html
 
-        <input name="data[User][gender]" id="UserGender_" value="" type="hidden" />
-        <input name="data[User][gender]" id="UserGenderM" value="M" type="radio" />
+        <input name="data[User][gender]" id="UserGender_" value=""
+            type="hidden" />
+        <input name="data[User][gender]" id="UserGenderM" value="M"
+            type="radio" />
         <label for="UserGenderM">Male</label>
-        <input name="data[User][gender]" id="UserGenderF" value="F" type="radio" />
+        <input name="data[User][gender]" id="UserGenderF" value="F"
+            type="radio" />
         <label for="UserGenderF">Female</label>
 
     If for some reason you don't want the hidden input, setting
@@ -1215,7 +1254,11 @@ Form Element-Specific Methods
     * ``$attributes['multiple']`` If 'multiple' has been set to true for an input that
       outputs a select, the select will allow multiple selections::
 
-        echo $this->Form->select('Model.field', $options, array('multiple' => true));
+        echo $this->Form->select(
+            'Model.field',
+            $options,
+            array('multiple' => true)
+        );
 
       Alternatively set 'multiple' to 'checkbox' to output a list of
       related check boxes::
@@ -1234,13 +1277,16 @@ Form Element-Specific Methods
 
         <div class="input select">
            <label for="ModelField">Field</label>
-           <input name="data[Model][field]" value="" id="ModelField" type="hidden">
+           <input name="data[Model][field]" value="" id="ModelField"
+            type="hidden">
            <div class="checkbox">
-              <input name="data[Model][field][]" value="Value 1" id="ModelField1" type="checkbox">
+              <input name="data[Model][field][]" value="Value 1"
+                id="ModelField1" type="checkbox">
               <label for="ModelField1">Label 1</label>
            </div>
            <div class="checkbox">
-              <input name="data[Model][field][]" value="Value 2" id="ModelField2" type="checkbox">
+              <input name="data[Model][field][]" value="Value 2"
+                id="ModelField2" type="checkbox">
               <label for="ModelField2">Label 2</label>
            </div>
         </div>
@@ -1264,13 +1310,16 @@ Form Element-Specific Methods
 
         <div class="input select">
            <label for="ModelField">Field</label>
-           <input name="data[Model][field]" value="" id="ModelField" type="hidden">
+           <input name="data[Model][field]" value="" id="ModelField"
+            type="hidden">
            <div class="checkbox">
-              <input name="data[Model][field][]" disabled="disabled" value="Value 1" id="ModelField1" type="checkbox">
+              <input name="data[Model][field][]" disabled="disabled"
+                value="Value 1" id="ModelField1" type="checkbox">
               <label for="ModelField1">Label 1</label>
            </div>
            <div class="checkbox">
-              <input name="data[Model][field][]" value="Value 2" id="ModelField2" type="checkbox">
+              <input name="data[Model][field][]" value="Value 2"
+                id="ModelField2" type="checkbox">
               <label for="ModelField2">Label 2</label>
            </div>
         </div>
@@ -1284,7 +1333,9 @@ Form Element-Specific Methods
     the form enctype is set to "multipart/form-data", so start off with
     a create function such as the following::
 
-        echo $this->Form->create('Document', array('enctype' => 'multipart/form-data'));
+        echo $this->Form->create('Document', array(
+            'enctype' => 'multipart/form-data'
+        ));
         // OR
         echo $this->Form->create('Document', array('type' => 'file'));
 
@@ -1421,7 +1472,10 @@ Creating buttons and submit elements
     bool and determines whether to HTML entity encode the $title of the button.
     Defaults to false::
 
-        echo $this->Form->button('Submit Form', array('type' => 'submit', 'escape' => true));
+        echo $this->Form->button('Submit Form', array(
+            'type' => 'submit',
+            'escape' => true
+        ));
 
 .. php:method:: postButton(string $title, mixed $url, array $options = array ())
 
@@ -1611,7 +1665,11 @@ inputDefaults. You can override the default options by declaring the option in t
 input() call::
 
     echo $this->Form->input('password'); // No div, no label with class 'fancy'
-    echo $this->Form->input('username', array('label' => 'Username')); // has a label element same defaults
+    // has a label element same defaults
+    echo $this->Form->input(
+        'username',
+        array('label' => 'Username')
+    );
 
 Working with SecurityComponent
 ==============================