cakephp · markstory · Jan 6, 2023 · Jan 5, 2023 · LordSimal · Jan 5, 2023
diff --git a/en/appendices/migration-guides.rst b/en/appendices/migration-guides.rst
@@ -7,16 +7,6 @@ each version and the migration path between 3.x and 4.x.
 .. toctree::
     :maxdepth: 1
 
-<<<<<<< HEAD
     ./5-0-upgrade-guide
     ./5-0-migration-guide
     ./fixture-upgrade
-=======
-    ./4-0-upgrade-guide
-    ./4-0-migration-guide
-    ./4-1-migration-guide
-    ./4-2-migration-guide
-    ./4-3-migration-guide
-    ./4-4-migration-guide
-    ./4-5-migration-guide
->>>>>>> 4.next
diff --git a/en/console-commands/input-output.rst b/en/console-commands/input-output.rst
@@ -105,9 +105,6 @@ content::
         | Cake Mix |        1.50 |
         +----------+-------------+
 
-.. versionadded:: 4.2.0
-    The ``<text-right>`` formatting tag was added in 4.2.
-
 Progress Helper
 ---------------
 

diff --git a/en/controllers.rst b/en/controllers.rst
@@ -420,9 +420,6 @@ the controller's default one::
         ])
         ->all();
 
-.. versionadded:: 4.3.0
-    ``Controller::fetchTable()`` was added. Prior to 4.3 you need to use ``Controller::loadModel()``.
-
 Paginating a Model
 ==================
 
@@ -549,9 +546,6 @@ controller use the ``middleware()`` method from your controller's
 
 Middleware defined by a controller will be called **before** ``beforeFilter()`` and action methods are called.
 
-.. versionadded:: 4.3.0
-    ``Controller::middleware()`` was added.
-
 More on Controllers
 ===================
 

diff --git a/en/controllers/components.rst b/en/controllers/components.rst
@@ -339,8 +339,6 @@ When raising a ``RedirectException`` you can include additional headers::
         'Header-Key' => 'value',
     ]);
 
-.. versionadded:: 4.1.0
-
 .. meta::
     :title lang=en: Components
     :keywords lang=en: array controller,core libraries,authentication request,array name,access control lists,public components,controller code,core components,cookiemonster,login cookie,configuration settings,functionality,logic,sessions,cakephp,doc
diff --git a/en/controllers/components/check-http-cache.rst b/en/controllers/components/check-http-cache.rst
@@ -3,9 +3,6 @@ Checking HTTP Cache
 
 .. php:class:: CheckHttpCacheComponent(ComponentCollection $collection, array $config = [])
 
-.. versionadded:: 4.4.0
-    The ``CheckHttpCacheComponent`` was added.
-
 The HTTP cache validation model is one of the processes used for cache gateways,
 also known as reverse proxies, to determine if they can serve a stored copy of
 a response to the client. Under this model, you mostly save bandwidth, but when

diff --git a/en/core-libraries/form.rst b/en/core-libraries/form.rst
@@ -108,9 +108,6 @@ the request data::
     // would use the rules defined by `validationUpdate()`
     $isValid = $form->validate($this->request->getData(), 'update');
 
-.. versionadded:: 4.3.0
-    Using validators other than ``default`` was added.
-
 Setting Form Values
 ===================
 
@@ -161,9 +158,6 @@ or a subset of fields::
         'email' => '[email protected]',
     ]);
 
-.. versionadded:: 4.1.0
-    The ``set()`` method was added.
-
 Getting Form Errors
 ===================
 

diff --git a/en/core-libraries/httpclient.rst b/en/core-libraries/httpclient.rst
@@ -309,12 +309,6 @@ continue using all the other options defined when the scoped client was created.
 See :ref:`http_client_request_options` for more information on the options
 supported.
 
-.. versionadded:: 4.2.0
-    ``Client::createFromUrl()`` was added.
-
-.. versionchanged:: 4.2.0
-    The ``basePath`` option was added.
-
 Setting and Managing Cookies
 ============================
 
@@ -516,9 +510,6 @@ strings::
     ];
     $response = $this->newClientResponse(200, $headers, $body)
 
-
-.. versionadded:: 4.3.0
-
 .. meta::
     :title lang=en: HttpClient
     :keywords lang=en: array name,array data,query parameter,query string,php class,string query,test type,string data,google,query results,webservices,apis,parameters,cakephp,meth,search results
diff --git a/en/core-libraries/internationalization-and-localization.rst b/en/core-libraries/internationalization-and-localization.rst
@@ -664,9 +664,6 @@ use a middleware to define both timezone conversion and locale parsing::
         }
     }
 
-.. versionadded:: 4.3.0
-    The ``setUserTimezone()`` method was added.
-
 Automatically Choosing the Locale Based on Request Data
 =======================================================
 

diff --git a/en/core-libraries/logging.rst b/en/core-libraries/logging.rst
@@ -136,9 +136,6 @@ one of the following methods:
 * ``toArray()``
 * ``__debugInfo()``
 
-.. versionadded:: 4.1.0
-    Logging placeholders were added.
-
 .. _logging-levels:
 
 Using Levels
@@ -381,9 +378,6 @@ To implement your own logging formatter you need to extend
 method you need to implement is ``format($level, $message, $context)`` which is
 responsible for formatting log messages.
 
-.. versionadded:: 4.3.0
-    Logging formatters were added in 4.3.0
-
 Log API
 =======
 

diff --git a/en/core-libraries/time.rst b/en/core-libraries/time.rst
@@ -155,10 +155,6 @@ This method sets the default format used when converting an object to json::
 .. note::
     This method must be called statically.
 
-.. versionchanged:: 4.1.0
-    The ``callable`` parameter type was added.
-
-
 .. php:method:: i18nFormat($format = null, $timezone = null, $locale = null)
 
 A very common thing to do with ``Time`` instances is to print out formatted

diff --git a/en/core-libraries/validation.rst b/en/core-libraries/validation.rst
@@ -353,9 +353,6 @@ When enabled all fields will stop validation on the first failing rule instead
 of checking all possible rules. In this case only a single error message will
 appear under the form field.
 
-.. versionadded::
-    The ``setStopOnFailure()`` method was added in 4.1.6.
-
 .. _adding-validation-providers:
 
 Adding Validation Providers
@@ -565,10 +562,10 @@ following::
 Validating Entity Data
 ======================
 
-Validation is meant for checking request data coming from forms or other user 
+Validation is meant for checking request data coming from forms or other user
 interfaces used to populate the entities.
 
-The request data is validated automatically when using the ``newEntity()``, 
+The request data is validated automatically when using the ``newEntity()``,
 ``newEntities()``, ``patchEntity()`` or ``patchEntities()`` methods of ``Table`` class::
 
     // In the ArticlesController class
@@ -601,9 +598,9 @@ validation sets to apply using the ``options`` parameter::
       ]
     ]);
 
-Apart from validating user provided data maintaining integrity of data regardless 
-where it came from is important. To solve this problem CakePHP offers a second 
-level of validation which is called "application rules". You can read more about 
+Apart from validating user provided data maintaining integrity of data regardless
+where it came from is important. To solve this problem CakePHP offers a second
+level of validation which is called "application rules". You can read more about
 them in the :ref:`Applying Application Rules <application-rules>` section.
 
 Core Validation Rules

diff --git a/en/development/debugging.rst b/en/development/debugging.rst
@@ -67,9 +67,6 @@ The following configuration options can be set in **config/app.php** to change h
 - ``Debugger.outputMask`` A mapping of ``key`` to ``replacement`` values that
   ``Debugger`` should replace in dumped data and logs generated by ``Debugger``.
 
-.. versionadded:: 4.1.0
-    ``Debugger`` configuration options were added.
-
 Outputting Values
 =================
 
@@ -200,9 +197,6 @@ additional editor formats if required during application bootstrap::
         return "thing://open={$file}&line={$line}";
     });
 
-.. versionadded:: 4.1.0
-    Editor link support was added in 4.1.0
-
 Using Logging to Debug
 ======================
 

diff --git a/en/development/dependency-injection.rst b/en/development/dependency-injection.rst
@@ -137,10 +137,6 @@ requires. Those dependencies can be either objects or primitive values::
 Your services can depend on ``ServerRequest`` in controller actions as it will
 be added automatically.
 
-
-.. versionchanged:: 4.4.0
-    The ``$request`` is registered automatically now.
-
 Adding Shared Services
 ----------------------
 
@@ -172,7 +168,7 @@ services like in a reporting system::
 
     $container->add(BillingReport::class)->addTag('reports');
     $container->add(UsageReport::class)->addTag('reports');
-    
+
     $container->add(ReportAggregate::class, function () use ($container) {
         return new ReportAggregate($container->get('reports'));
     });

diff --git a/en/development/errors.rst b/en/development/errors.rst
@@ -35,7 +35,7 @@ options are supported:
   the memory limit by when a fatal error is encountered. This allows breathing
   room to complete logging or error handling.
 * ``logger`` (prior to 4.4.0 use ``errorLogger``) -
-  ``Cake\Error\ErrorLoggerInterface`` - The class responsible for logging 
+  ``Cake\Error\ErrorLoggerInterface`` - The class responsible for logging
   errors and unhandled exceptions. Defaults to ``Cake\Error\ErrorLogger``.
 * ``errorRenderer`` - ``Cake\Error\ErrorRendererInterface`` - The class responsible
   for rendering errors. Default is chosen based on PHP SAPI.
@@ -85,9 +85,6 @@ You can temporarily disable deprecation warnings in one of a few ways:
    Would ignore all deprecations from your ``Models`` directory and the
    ``Contacts`` plugin in your application.
 
-.. versionadded:: 4.2.0
-    The ``Error.ignoredDeprecationPaths`` option was added.
-
 .. php:class:: ExceptionRenderer(Exception $exception)
 
 Changing Exception Handling
@@ -137,12 +134,6 @@ Within an ``Exception.beforeRender`` handler you have a few options:
 * Return a response from the event listener to skip rendering and use
   the provided response instead.
 
-.. versionadded:: 4.4.0
-    Error and Exception events were added.
-
-.. versionchanged:: 4.5.0
-   The ``beforeRender`` events can now replace exceptions and replace rendering.
-
 .. _error-views:
 
 Custom Error Templates
@@ -376,13 +367,6 @@ Prior to CakePHP 4.4.0, you should implement ``logMessage()`` and ``log()``::
         }
     }
 
-.. versionadded:: 4.1.0
-    ErrorLoggerInterface was added.
-
-.. versionchanged:: 4.4.0
-    ``ErrorLoggerInterface::logException()`` and``ErrorLoggerInterface::logError()`` were added.
-
-
 Custom Error Rendering
 ======================
 
@@ -412,9 +396,6 @@ errors you can create a class::
 The constructor of your renderer will be passed an array of all the Error
 configuration.
 
-.. versionadded:: 4.4.0
-    ErrorRendererInterface was added.
-
 .. index:: application exceptions
 
 Creating your own Application Exceptions

diff --git a/en/development/sessions.rst b/en/development/sessions.rst
@@ -352,9 +352,6 @@ compatible syntax::
 
     $session->read('Config.language', 'en');
 
-.. versionchanged:: 4.1.0
-    The ``default`` parameter was added.
-
 .. php:method:: readOrFail($key)
 
 The same as convenience wrapper around non-nullable return value::
@@ -364,9 +361,6 @@ The same as convenience wrapper around non-nullable return value::
 This is useful, when you know this key has to be set and you don't want to have to check
 for the existence in code itself.
 
-.. versionadded:: 4.1.0
-    The ``readOrFail()`` was added.
-
 .. php:method:: write($key, $value)
 
 ``$key`` should be the dot separated path you wish to write ``$value`` to::

diff --git a/en/development/testing.rst b/en/development/testing.rst
@@ -553,9 +553,6 @@ To load a SQL dump file you can use the following::
 At the beginning of each test run ``SchemaLoader`` will drop all tables in the
 connection and rebuild tables based on the provided schema file.
 
-.. versionadded:: 4.3.0
-    SchemaLoader was added.
-
 .. _fixture-state-management:
 
 Fixture State Managers
@@ -586,8 +583,6 @@ The fixture state management strategy can be defined within the test case::
         }
     }
 
-.. versionadded:: 4.3.0
-
 Creating Fixtures
 -----------------
 
@@ -651,11 +646,6 @@ should be an associative array of the columns and values for the row. Just keep
 in mind that each record in the ``$records`` array must have the same keys as
 rows are bulk inserted.
 
-.. versionchanged:: 4.3.0
-
-    Prior to 4.3.0 fixtures would also define the table's schema. You can learn more
-    about :ref:`fixture-schema` if you still need to define schema in your fixtures.
-
 Dynamic Data
 ------------
 

diff --git a/en/orm/behaviors/tree.rst b/en/orm/behaviors/tree.rst
@@ -98,14 +98,14 @@ in a hierarchy, you can stack the 'threaded' finder::
     }
 
 While, if you’re using custom ``parent_id`` you need to pass it in the
-'threaded' finder option (i.e. ``parentField``) . 
+'threaded' finder option (i.e. ``parentField``) .
 
 .. note::
     For more information on 'threaded' finder options see :ref:`Finding Threaded Data logic <finding-threaded-data>`
 
 Getting formatted tree lists
 ----------------------------
- 
+
 Traversing threaded results usually requires recursive functions in, but if you
 only require a result set containing a single field from each level so you can
 display a list, in an HTML select for example, it is better to use the
@@ -261,9 +261,6 @@ fired when tree nodes are deleted::
         'cascadeCallbacks' => true,
     ]);
 
-.. versionadded:: 4.4.0
-    The ``cascadeCallbacks`` option was added.
-
 Recovering with custom sort field
 =================================
 
@@ -335,7 +332,7 @@ conditional deletes::
     }
 
 TreeBehavior will reorder the ``lft`` and ``rght`` values of records in the
-table when a node is deleted. 
+table when a node is deleted.
 
 In our example above, the ``lft`` and ``rght`` values of the entities inside
 ``$descendants`` will be inaccurate. You will need to reload existing entity

diff --git a/en/orm/database-basics.rst b/en/orm/database-basics.rst
@@ -289,9 +289,6 @@ for both::
 You can specify the same value for both ``read`` and ``write`` key without creating
 multiple connections to the database.
 
-.. versionadded:: 4.5.0
-    Read and write connection roles were added.
-
 .. php:namespace:: Cake\Datasource
 
 Managing Connections
@@ -644,9 +641,6 @@ no value for the current database driver:
 - ``precision`` The precision of the column if available.
 - ``scale`` Can be included for SQLServer connections.
 
-.. versionadded:: 4.3.0
-    ``ColumnSchemaAwareInterface`` was added.
-
 .. _mapping-custom-datatypes-to-sql-expressions:
 
 Mapping Custom Datatypes to SQL Expressions