Commit History

Author SHA1 Message Date
  Mark Story aad65a0faf Merge branch 'master' into 3.next 8 years ago
  Dariusz Ruminski c936250731 Use adventage of newer PHPUnit sytax 8 years ago
  Mark Story b049f90761 Fix phpcs errors. 8 years ago
  Florian Krämer 53cac1bec9 Added deprecation warnings to the core package 8 years ago
  ADmad 47f2a3cff9 Add support for default value to InstanceConfigTrait::getConfig(). 8 years ago
  Marc Würth 3a6bd75832 Use HTTPS for the opensource.org URL 8 years ago
  Marc Würth c61ab5ee95 Use HTTPS for the cakefoundation.org URL 8 years ago
  Marc Würth 4c774ce4b7 Use HTTPS for the cakephp.org URL 8 years ago
  Cory Thompson 902c991027 Fix numerous typos 9 years ago
  Marc Würth 05305555a3 Remove superfluous whitespace in doc blocks 9 years ago
  Jan Sukenik 5872fc6b92 FIxed deletion of nested values in InstanceConfigTrait 11 years ago
  Michael Pirouet 6261c5096d Code Cleanup - Exception 11 years ago
  Adam Taylor 9368c625ef Fix typos 11 years ago
  ADmad 0f4565e765 Add InstanceConfigTrait::configShallow() for non-recursive merge of config. 11 years ago
  ADmad 628cd0ef6d Add shallow merge ability to InstanceConfigTrait::config() 11 years ago
  Bryan Crowe be845a3a01 Run phpcbf for PSR2 CS fixers 11 years ago
  Bryan Crowe d52ae87485 Fix license docblocks for phpdoc format 12 years ago
  AD7six c038ebfabf make config chainable 12 years ago
  AD7six 7917fd7670 merge by default 12 years ago
  AD7six 08a6faf077 Add merge option to InstanceConfig trait 12 years ago
  AD7six 346db3c13d test file was .. misnamed :| 12 years ago