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: 2.10.7
Choose a base ref
...
head repository: cakephp/cakephp
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2.10.8
Choose a head ref
  • 18 commits
  • 9 files changed
  • 5 contributors

Commits on Jan 9, 2018

  1. Fix missing field identifier quoting for COUNT(DISTINCT in SQLServer. 

    Refs #11186
    @markstory
    markstory committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    45695b6 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2018

  1. Make mcrypt optional 

    Now Security::encrypt() and Security::decrypt() works with openssl
if the mcrypt extension is unavailable.
Note that Security::rijndael() doesn't work with openssl.
    @chinpei215
    chinpei215 committed Jan 19, 2018
    Configuration menu
    Copy the full SHA
    d7ed033 View commit details
    Browse the repository at this point in the history

  2. Change Security::randomBytes() to fallback to mcrypt_create_iv()

    @chinpei215
    chinpei215 committed Jan 19, 2018
    Configuration menu
    Copy the full SHA
    5289aae View commit details
    Browse the repository at this point in the history

  3. Pass MCRYPT_DEV_URANDOM to mcrypt_create_iv() explicitly

    @chinpei215
    chinpei215 committed Jan 19, 2018
    Configuration menu
    Copy the full SHA
    fc397bd View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2018

  1. Fixed PHP Unit version so running tests using the Console works

    David Yell committed Jan 24, 2018
    Configuration menu
    Copy the full SHA
    5c5ec45 View commit details
    Browse the repository at this point in the history

  2. Added a test case for the helper with no params. Relates to #11658

    David Yell committed Jan 24, 2018
    Configuration menu
    Copy the full SHA
    230066a View commit details
    Browse the repository at this point in the history

  3. Fixed the PHPCS warnings

    David Yell committed Jan 24, 2018
    Configuration menu
    Copy the full SHA
    bcae200 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #11660 from davidyell/2.x-phpunit37 

    2.x - Change PHPUnit version as requested by test shell
    @markstory
    markstory authored Jan 24, 2018
    Configuration menu
    Copy the full SHA
    46dacd5 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2018

  1. Fix phpcs error.

    @markstory
    markstory committed Jan 25, 2018
    Configuration menu
    Copy the full SHA
    5d9a3cb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'issue-11661' into 2.x

    @markstory
    markstory committed Jan 25, 2018
    Configuration menu
    Copy the full SHA
    49725a8 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2018

  1. Fix usage of non-existant property. 

    Use the declared `_result` property instead. I would normally add
a test, but getting to this path requires a query to fail which is not
simple to simulate in the test harness.

Fixes #11615
    @markstory
    markstory committed Feb 4, 2018
    Configuration menu
    Copy the full SHA
    5816143 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2018

  1. Merge pull request #11616 from cakephp/issue-11186 

    Fix missing field identifier quoting for COUNT(DISTINCT in SQLServer.
    @dereuromark
    dereuromark authored Feb 5, 2018
    Configuration menu
    Copy the full SHA
    df9c7fd View commit details
    Browse the repository at this point in the history

  2. Merge pull request #6 from cakephp/2.x 

    sync with 2.x upstream
    @bancer
    bancer authored Feb 5, 2018
    Configuration menu
    Copy the full SHA
    f0abce5 View commit details
    Browse the repository at this point in the history

  3. Constructs the default fixture manager if 'fixtureManager' parameter … 

    …is an empty string.
    @bancer
    bancer authored Feb 5, 2018
    Configuration menu
    Copy the full SHA
    1b11fa7 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #11695 from bancer/issue-11694-web-test-runner 

    Issue 11694 web test runner
    @markstory
    markstory authored Feb 5, 2018
    Configuration menu
    Copy the full SHA
    f1db013 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2018

  1. Remove Security::engine() 

    We disscussed and decided to avoid auto selecting which extension to use.
Instead, call Configure::write('Security.useOpenSsl', true) manually.
    @chinpei215
    chinpei215 committed Feb 24, 2018
    Configuration menu
    Copy the full SHA
    a6b0271 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2018

  1. Merge pull request #11643 from chinpei215/2.x-make-mcrypt-optional 

    [2.x] Make mcrypt optional
    @markstory
    markstory authored Feb 25, 2018
    Configuration menu
    Copy the full SHA
    e0e4a3b View commit details
    Browse the repository at this point in the history

  2. Update version number to 2.10.8

    @markstory
    markstory committed Feb 25, 2018
    Configuration menu
    Copy the full SHA
    8744e53 View commit details
    Browse the repository at this point in the history
Loading