Skip to content

Commit 5e996cd

Browse files
author
euromark
committed
Consolidate doc block headings.
1 parent d4eaf22 commit 5e996cd

32 files changed

+75
-75
lines changed

src/Collection/CollectionInterface.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function each(callable $c);
5353
* in the current iteration, the key of the element and this collection as
5454
* arguments, in that order.
5555
*
56-
* ## Example:
56+
* ### Example:
5757
*
5858
* Filtering odd numbers in an array, at the end only the value 2 will
5959
* be present in the resulting collection:
@@ -79,7 +79,7 @@ public function filter(callable $c = null);
7979
* in the current iteration, the key of the element and this collection as
8080
* arguments, in that order.
8181
*
82-
* ## Example:
82+
* ### Example:
8383
*
8484
* Filtering even numbers in an array, at the end only values 1 and 3 will
8585
* be present in the resulting collection:
@@ -157,7 +157,7 @@ public function contains($value);
157157
* in the current iteration, the key of the element and this collection as
158158
* arguments, in that order.
159159
*
160-
* ## Example:
160+
* ### Example:
161161
*
162162
* Getting a collection of booleans where true indicates if a person is female:
163163
*

src/Collection/Iterator/MapReduce.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class MapReduce implements IteratorAggregate {
7878
/**
7979
* Constructor
8080
*
81-
* ## Example:
81+
* ### Example:
8282
*
8383
* Separate all unique odd and even numbers in an array
8484
*

src/Collection/Iterator/TreeIterator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public function __construct(RecursiveIterator $items, $mode = RecursiveIteratorI
6161
* the current element as first parameter, the current iteration key as second
6262
* parameter, and the iterator instance as third argument.
6363
*
64-
* ## Example
64+
* ### Example
6565
*
6666
* {{{
6767
* $printer = (new Collection($treeStructure))->listNested()->printer('name');

src/Controller/Component.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
* controller logic that can be composed into a controller. Components also
2424
* provide request life-cycle callbacks for injecting logic at specific points.
2525
*
26-
* ## Initialize hook
26+
* ### Initialize hook
2727
*
2828
* Like Controller and Table, this class has an initialize() hook that you can use
2929
* to add custom 'constructor' logic. It is important to remember that each request
3030
* (and sub-request) will only make one instance of any given component.
3131
*
32-
* ## Life cycle callbacks
32+
* ### Life cycle callbacks
3333
*
3434
* Components can provide several callbacks that are fired at various stages of the request
3535
* cycle. The available callbacks are:

src/Controller/Component/PaginatorComponent.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public function implementedEvents() {
6565
/**
6666
* Handles automatic pagination of model records.
6767
*
68-
* ## Configuring pagination
68+
* ### Configuring pagination
6969
*
7070
* When calling `paginate()` you can use the $settings parameter to pass in pagination settings.
7171
* These settings are used to build the queries made and control other pagination settings.

src/Core/Configure.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ public static function load($key, $config = 'default', $merge = true) {
264264
* 'default' adapter is a PhpConfig, the generated file will be a PHP
265265
* configuration file loadable by the PhpConfig.
266266
*
267-
* ## Usage
267+
* ### Usage
268268
*
269269
* Given that the 'default' engine is an instance of PhpConfig.
270270
* Save all data in Configure to the file `my_config.php`:

src/Core/Plugin.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class Plugin {
5151
* This method does not configure any autoloaders. That must be done separately either
5252
* through composer, or your own code during config/bootstrap.php.
5353
*
54-
* ## Examples:
54+
* ### Examples:
5555
*
5656
* `Plugin::load('DebugKit')`
5757
*
@@ -91,7 +91,7 @@ class Plugin {
9191
*
9292
* Will only load the bootstrap for ApiGenerator and only the routes for DebugKit
9393
*
94-
* ## Configuration options
94+
* ### Configuration options
9595
*
9696
* - `bootstrap` - array - Whether or not you want the $plugin/config/bootstrap.php file loaded.
9797
* - `routes` - boolean - Whether or not you want to load the $plugin/config/routes.php file.

src/Database/Connection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ public function rollback() {
438438
* If you are trying to enable this feature, make sure you check the return value of this
439439
* function to verify it was enabled successfully.
440440
*
441-
* ## Example:
441+
* ### Example:
442442
*
443443
* `$connection->useSavePoints(true)` Returns true if drivers supports save points, false otherwise
444444
* `$connection->useSavePoints(false)` Disables usage of savepoints and returns false

src/Database/Expression/FunctionExpression.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class FunctionExpression extends QueryExpression {
4242
* By default, all params that are passed will be quoted. If you wish to use
4343
* literal arguments, you need to explicitly hint this function.
4444
*
45-
* ## Examples:
45+
* ### Examples:
4646
*
4747
* ``$f = new FunctionExpression('CONCAT', ['CakePHP', ' rules']);``
4848
*

src/Database/Query.php

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ public function sql(ValueBinder $generator = null) {
197197
* The callback will receive 2 parameters, the first one is the value of the query
198198
* part that is being iterated and the second the name of such part.
199199
*
200-
* ## Example:
200+
* ### Example:
201201
* {{{
202202
* $query->select(['title'])->from('articles')->traverse(function ($value, $clause) {
203203
* if ($clause === 'select') {
@@ -230,7 +230,7 @@ public function traverse(callable $visitor, array $parts = []) {
230230
* By default this function will append any passed argument to the list of fields
231231
* to be selected, unless the second argument is set to true.
232232
*
233-
* ## Examples:
233+
* ### Examples:
234234
*
235235
* {{{
236236
* $query->select(['id', 'title']); // Produces SELECT id, title
@@ -275,7 +275,7 @@ public function select($fields = [], $overwrite = false) {
275275
* or set of fields, you may pass an array of fields to filter on. Beware that
276276
* this option might not be fully supported in all database systems.
277277
*
278-
* ## Examples:
278+
* ### Examples:
279279
*
280280
* {{{
281281
* // Filters products with the same name and city
@@ -355,7 +355,7 @@ public function modifier($modifiers, $overwrite = false) {
355355
*
356356
* This method can be used for select, update and delete statements.
357357
*
358-
* ## Examples:
358+
* ### Examples:
359359
*
360360
* {{{
361361
* $query->from(['p' => 'posts']); // Produces FROM posts p
@@ -433,7 +433,7 @@ public function from($tables = [], $overwrite = false) {
433433
* // INNER JOIN products p (a.owner_id = p.id)
434434
* }}}
435435
*
436-
* ## Using conditions and types
436+
* ### Using conditions and types
437437
*
438438
* Conditions can be expressed, as in the examples above, using a string for comparing
439439
* columns, or string with already quoted literal values. Additionally it is
@@ -454,7 +454,7 @@ public function from($tables = [], $overwrite = false) {
454454
* ]], ['a.posted' => 'datetime', 'a.published' => 'boolean'])
455455
* }}}
456456
*
457-
* ## Overwriting joins
457+
* ### Overwriting joins
458458
*
459459
* When creating aliased joins using the array notation, you can override
460460
* previous join definitions by using the same alias in consequent
@@ -632,7 +632,7 @@ protected function _makeJoin($table, $conditions, $type) {
632632
* Any conditions created with this methods can be used with any SELECT, UPDATE
633633
* and DELETE type of queries.
634634
*
635-
* ## Conditions using operators:
635+
* ### Conditions using operators:
636636
*
637637
* {{{
638638
* $query->where([
@@ -649,7 +649,7 @@ protected function _makeJoin($table, $conditions, $type) {
649649
* Second parameter is used to specify what type is expected for each passed
650650
* key. Valid types can be used from the mapped with Database\Type class.
651651
*
652-
* ## Nesting conditions with conjunctions:
652+
* ### Nesting conditions with conjunctions:
653653
*
654654
* {{{
655655
* $query->where([
@@ -674,7 +674,7 @@ protected function _makeJoin($table, $conditions, $type) {
674674
* the AND operator. Also, using the same array key twice in consecutive calls to
675675
* this method will not override the previous value.
676676
*
677-
* ## Using expressions objects:
677+
* ### Using expressions objects:
678678
*
679679
* {{{
680680
* $exp = $query->newExpr()->add(['id !=' => 100, 'author_id' != 1])->type('OR');
@@ -687,7 +687,7 @@ protected function _makeJoin($table, $conditions, $type) {
687687
*
688688
* Other Query objects that be used as conditions for any field.
689689
*
690-
* ## Adding conditions in multiple steps:
690+
* ### Adding conditions in multiple steps:
691691
*
692692
* You can use callable functions to construct complex expressions, functions
693693
* receive as first argument a new QueryExpression object and this query instance
@@ -708,7 +708,7 @@ protected function _makeJoin($table, $conditions, $type) {
708708
*
709709
* ``WHERE title != 'Hello World' AND (id = 1 OR (id > 2 AND id < 10))``
710710
*
711-
* ## Conditions as strings:
711+
* ### Conditions as strings:
712712
*
713713
* {{{
714714
* $query->where(['articles.author_id = authors.id', 'modified IS NULL']);
@@ -755,7 +755,7 @@ public function where($conditions = null, $types = [], $overwrite = false) {
755755
* that each array entry will be joined to the other using the AND operator, unless
756756
* you nest the conditions in the array using other operator.
757757
*
758-
* ## Examples:
758+
* ### Examples:
759759
*
760760
* {{{
761761
* $query->where(['title' => 'Hello World')->andWhere(['author_id' => 1]);
@@ -816,7 +816,7 @@ public function andWhere($conditions, $types = []) {
816816
* that each array entry will be joined to the other using the OR operator, unless
817817
* you nest the conditions in the array using other operator.
818818
*
819-
* ## Examples:
819+
* ### Examples:
820820
*
821821
* {{{
822822
* $query->where(['title' => 'Hello World')->orWhere(['title' => 'Foo']);
@@ -874,7 +874,7 @@ public function orWhere($conditions, $types = []) {
874874
* By default this function will append any passed argument to the list of fields
875875
* to be selected, unless the second argument is set to true.
876876
*
877-
* ## Examples:
877+
* ### Examples:
878878
*
879879
* {{{
880880
* $query->order(['title' => 'DESC', 'author_id' => 'ASC']);
@@ -929,7 +929,7 @@ public function order($fields, $overwrite = false) {
929929
* By default this function will append any passed argument to the list of fields
930930
* to be grouped, unless the second argument is set to true.
931931
*
932-
* ## Examples:
932+
* ### Examples:
933933
*
934934
* {{{
935935
* // Produces GROUP BY id, title
@@ -1046,7 +1046,7 @@ public function page($num, $limit = null) {
10461046
* In some databases, this operation might not be supported or will require
10471047
* the query to be transformed in order to limit the result set size.
10481048
*
1049-
* ## Examples
1049+
* ### Examples
10501050
*
10511051
* {{{
10521052
* $query->limit(10) // generates LIMIT 10
@@ -1073,7 +1073,7 @@ public function limit($num) {
10731073
* In some databases, this operation might not be supported or will require
10741074
* the query to be transformed in order to limit the result set size.
10751075
*
1076-
* ## Examples
1076+
* ### Examples
10771077
*
10781078
* {{{
10791079
* $query->offset(10) // generates OFFSET 10
@@ -1100,7 +1100,7 @@ public function offset($num) {
11001100
* By default, the UNION operator will remove duplicate rows, if you wish to include
11011101
* every row for all queries, use unionAll().
11021102
*
1103-
* ## Examples
1103+
* ### Examples
11041104
*
11051105
* {{{
11061106
* $union = (new Query($conn))->select(['id', 'title'])->from(['a' => 'articles']);
@@ -1439,7 +1439,7 @@ public function clause($name) {
14391439
* If you wish to remove all decorators from the stack, set the first parameter
14401440
* to null and the second to true.
14411441
*
1442-
* ## Example
1442+
* ### Example
14431443
*
14441444
* {{{
14451445
* $query->decorateResults(function ($row) {

0 commit comments

Comments
 (0)