Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added merge support #96

Merged
merged 9 commits into from
Feb 18, 2018
Merged

Added merge support #96

merged 9 commits into from
Feb 18, 2018

Commits on Dec 2, 2015

  1. Configuration menu
    Copy the full SHA
    5b338e6 View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2015

  1. Merge pull request hassankhan#61 from tobsn/patch-1

    Add `use Noodlehaus\Config;` in README.md
    DavidePastore committed Dec 27, 2015
    Configuration menu
    Copy the full SHA
    663482b View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2016

  1. Merge branch 'release/0.9.0'

    * release/0.9.0:
      Updated `CHANGELOG.md`
      Close hassankhan#55. Unset cache after a set (another case)
      Close hassankhan#55. Unset cache after a set
      Fixed code sniffer errors
      Added unit tests for Iterator methods and implementation as a whole
      Fixed explanation in docblocks for current and key
      AbstractConfig implements Iterator; added declaration and five needed methods
      PSR-2
      Closed hassankhan#44.
      Add documentation for all method
      Add all() method to AbstractConfig.php, ConfigInterface.php and add test. Close hassankhan#48.
      Fix hassankhan#49.
      Remove !$temp check to fix loading an empty array
      [ci skip] Names update
      Some refactoring in `Config`
      General fixes, updated tests
      Update .gitignore
      Remove remove ùethod
      Add has and remove methods
    hassankhan committed Jan 23, 2016
    Configuration menu
    Copy the full SHA
    66ec05e View commit details
    Browse the repository at this point in the history
  2. Merge branch 'release/0.9.1'

    * release/0.9.1:
      Updated Travis CI configuration
    hassankhan committed Jan 23, 2016
    Configuration menu
    Copy the full SHA
    f57a068 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2016

  1. Merge branch 'release/0.10.0'

    * release/0.10.0:
      Updated `CHANGELOG.md`
      [hassankhan#66] Check if the configuration key exists instead of assuming that a null value equals the configuration doesn't have the requested key.
      Add support for .dist extensions files
      rearrange error handling to reach 100% test coverage;
      PSR2 corrections as generated by PHPCBF;
      provide package-level exceptions, so that callers can catch at the package level;
    hassankhan committed Feb 11, 2016
    Configuration menu
    Copy the full SHA
    06ac500 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2017

  1. Merge branch 'release/0.11.0'

    * release/0.11.0:
      fix for issue hassankhan#86 (hassankhan#87)
      removed unused variable
      expand dotted keys from ini-files
      use static method to obtain supported extensions
      Add remove function in AbstractConfig. Close hassankhan#76
    hassankhan committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    22db591 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'release/0.11.1'

    * release/0.11.1:
      Fix markdown for contact email address
    hassankhan committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    9bba837 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'release/0.11.2'

    * release/0.11.2:
      [ci skip] Add note to `README.md` about PHP support
      Add PHP 5.6, 7.0 to `allow_failures`
      Attempt to fix Travis build errors
    hassankhan committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    7fbc236 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2018

  1. added merge support

    raffis committed Jan 31, 2018
    Configuration menu
    Copy the full SHA
    5e2e594 View commit details
    Browse the repository at this point in the history