Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: cakephp/cakephp
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4.1.2
Choose a base ref
...
head repository: cakephp/cakephp
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4.1.3
Choose a head ref
  • 19 commits
  • 25 files changed
  • 5 contributors

Commits on Aug 11, 2020

  1. Add function name to window so that debugkit can use it

    Because jQuery's script tag insertion happens *after* DOMContentLoaded
    we need a window hook to allow debug kit to have interactive dump
    blocks.
    markstory committed Aug 11, 2020
    Configuration menu
    Copy the full SHA
    7c69d44 View commit details
    Browse the repository at this point in the history
  2. Ensure plugin path config is loaded for each PluginCollection::findPa…

    …th() call.
    
    This is necessary primarily for testing because the Configure::clear() call
    in TestCase::tearDown() wipes out all configuration including plugin paths config.
    
    Reverts #14860. Closes #14889.
    ADmad committed Aug 11, 2020
    Configuration menu
    Copy the full SHA
    e08bbba View commit details
    Browse the repository at this point in the history
  3. Merge pull request #14890 from cakephp/fix/debug-blocks

    Add function name to window so that debugkit can use it
    markstory authored Aug 11, 2020
    Configuration menu
    Copy the full SHA
    694f268 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #14891 from cakephp/issue-14889

    Ensure plugin path config is loaded for each PluginCollection::findPath() call.
    othercorey authored Aug 11, 2020
    Configuration menu
    Copy the full SHA
    93506b6 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2020

  1. Configuration menu
    Copy the full SHA
    da48606 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #14895 from cakephp/master-tests-pag

    Tests for url and pagination first/last
    markstory authored Aug 12, 2020
    Configuration menu
    Copy the full SHA
    85099a6 View commit details
    Browse the repository at this point in the history
  3. Fix use of libxml_disable_entity_loader() for Xml::build() too.

    Removed code duplication. Refs #14886.
    ADmad committed Aug 12, 2020
    Configuration menu
    Copy the full SHA
    80cbc75 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    233a531 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2020

  1. Merge pull request #14896 from cakephp/xml-entity-loader

    Fix use of libxml_disable_entity_loader() for Xml::build() too.
    markstory authored Aug 13, 2020
    Configuration menu
    Copy the full SHA
    f988197 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #14893 from cakephp/sqlserver-max

    Throw exception when exceeding maximum number of Sql Server parameters
    markstory authored Aug 13, 2020
    Configuration menu
    Copy the full SHA
    1047294 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2bdd7da View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    7d64157 View commit details
    Browse the repository at this point in the history
  5. Added connection retry logic to Driver. Configured SqlServer to retry…

    … connection on Azure Database paused error code.
    othercorey committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    046fb35 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2020

  1. Fix output buffers not being closed when the view triggers an exception.

    When evaluating a template or caching a block, the view itself opens a
    buffer, and the templates/blocks that it evaluates might open buffers
    too. In case an exception happens, the opened buffers will not be
    closed, causing risky tests with PHPUnit, and possible further output to
    be swallowed unless the test itself closes/flushes the remaining
    buffers.
    ndm2 committed Aug 14, 2020
    Configuration menu
    Copy the full SHA
    ec43ae7 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #14884 from cakephp/retry-connect

    Added connection retry logic to Driver
    othercorey authored Aug 14, 2020
    Configuration menu
    Copy the full SHA
    1915a04 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3c5b8a2 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #14904 from cakephp/datetype-marshal

    Ensure DateType marshalling works for both mutable and immutable types
    markstory authored Aug 14, 2020
    Configuration menu
    Copy the full SHA
    20381a6 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2020

  1. Merge pull request #14901 from ndm2/4.x-fix-output-buffers-not-being-…

    …closed
    
    4.x - Fix output buffers not being closed when the view triggers an exception.
    markstory authored Aug 15, 2020
    Configuration menu
    Copy the full SHA
    bf9299f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2c0273a View commit details
    Browse the repository at this point in the history
Loading