Skip to content

Commit

Permalink
Rewriting as Laminas Project package
Browse files Browse the repository at this point in the history
  • Loading branch information
weierophinney committed Dec 31, 2019
1 parent ed0e20c commit 293b1d8
Show file tree
Hide file tree
Showing 87 changed files with 863 additions and 3,325 deletions.
6 changes: 3 additions & 3 deletions .docheader
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @see https://github.com/zendframework/zend-config for the canonical source repository
* @copyright Copyright (c) %regexp:(20\d{2}-)?20\d{2}% Zend Technologies USA Inc. (http://www.zend.com)
* @license https://github.com/zendframework/zend-config/blob/master/LICENSE.md New BSD License
* @see https://github.com/laminas/laminas-config for the canonical source repository
* @copyright https://github.com/laminas/laminas-config/blob/master/COPYRIGHT.md
* @license https://github.com/laminas/laminas-config/blob/master/LICENSE.md New BSD License
*/
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
/.gitattributes export-ignore
/.gitignore export-ignore
/.travis.yml export-ignore
/composer.lock export-ignore
/docs/ export-ignore
/mkdocs.yml export-ignore
/phpcs.xml export-ignore
Expand Down
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/clover.xml
/composer.lock
/coveralls-upload.json
/docs/html/
/laminas-mkdoc-theme.tgz
/laminas-mkdoc-theme/
/phpunit.xml
/vendor/
/zf-mkdoc-theme.tgz
/zf-mkdoc-theme/
28 changes: 6 additions & 22 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,23 @@ env:
global:
- COMPOSER_ARGS="--no-interaction"
- COVERAGE_DEPS="php-coveralls/php-coveralls"
- TESTS_ZEND_CONFIG_YAML_ENABLED=true
- TESTS_ZEND_CONFIG_YAML_LIB_INCLUDE="Spyc.php"
- TESTS_ZEND_CONFIG_WRITER_YAML_CALLBACK="Spyc::YAMLDump"
- TESTS_ZEND_CONFIG_READER_YAML_CALLBACK="Spyc::YAMLLoadString"
- TESTS_LAMINAS_CONFIG_YAML_ENABLED=true
- TESTS_LAMINAS_CONFIG_YAML_LIB_INCLUDE="Spyc.php"
- TESTS_LAMINAS_CONFIG_WRITER_YAML_CALLBACK="Spyc::YAMLDump"
- TESTS_LAMINAS_CONFIG_READER_YAML_CALLBACK="Spyc::YAMLLoadString"

matrix:
fast_finish: true
include:
- php: 5.6
env:
- DEPS=lowest
- php: 5.6
env:
- DEPS=locked
- LEGACY_DEPS="phpunit/phpunit"
- php: 5.6
env:
- DEPS=latest
- php: 7
env:
- DEPS=lowest
- php: 7
env:
- DEPS=locked
- LEGACY_DEPS="phpunit/phpunit"
- php: 7
env:
- DEPS=latest
Expand All @@ -40,27 +33,18 @@ matrix:
- DEPS=lowest
- php: 7.1
env:
- DEPS=locked
- DEPS=latest
- CS_CHECK=true
- TEST_COVERAGE=true
- php: 7.1
env:
- DEPS=latest
- php: 7.2
env:
- DEPS=lowest
- php: 7.2
env:
- DEPS=locked
- php: 7.2
env:
- DEPS=latest
- php: 7.3
env:
- DEPS=lowest
- php: 7.3
env:
- DEPS=locked
- php: 7.3
env:
- DEPS=latest
Expand Down
76 changes: 38 additions & 38 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ All notable changes to this project will be documented in this file, in reverse

### Added

- [#54](https://github.com/zendframework/zend-config/pull/54) adds support for PHP 7.3.
- [#58](https://github.com/zendframework/zend-config/pull/58) adds
- [zendframework/zend-config#54](https://github.com/zendframework/zend-config/pull/54) adds support for PHP 7.3.
- [zendframework/zend-config#58](https://github.com/zendframework/zend-config/pull/58) adds
`$processSections` to INI reader, allowing control over whether sections
should be parsed or not
- [#63](https://github.com/zendframework/zend-config/pull/63) adds .yml to
Zend\Config\Factory as an alternative extension for yaml
- [zendframework/zend-config#63](https://github.com/zendframework/zend-config/pull/63) adds .yml to
Laminas\Config\Factory as an alternative extension for yaml

### Changed

Expand All @@ -55,11 +55,11 @@ All notable changes to this project will be documented in this file, in reverse

### Added

- [#47](https://github.com/zendframework/zend-config/pull/47) adds `Zend\Config\Writer\JavaProperties`, a complement to
`Zend\Config\Reader\JavaProperties`, for writing JavaProperties files from configuration. The writer supports
- [zendframework/zend-config#47](https://github.com/zendframework/zend-config/pull/47) adds `Laminas\Config\Writer\JavaProperties`, a complement to
`Laminas\Config\Reader\JavaProperties`, for writing JavaProperties files from configuration. The writer supports
specifying an alternate key/value delimiter (the default is ":") via the constructor.

- [#46](https://github.com/zendframework/zend-config/pull/46) adds a constructor option to the JavaProperties reader to allow
- [zendframework/zend-config#46](https://github.com/zendframework/zend-config/pull/46) adds a constructor option to the JavaProperties reader to allow
users to indicate keys and values from the configuration should be trimmed of whitespace:

```php
Expand All @@ -69,10 +69,10 @@ All notable changes to this project will be documented in this file, in reverse
);
```

- [#45](https://github.com/zendframework/zend-config/pull/45) adds the ability to specify an alternate key/value delimiter to
- [zendframework/zend-config#45](https://github.com/zendframework/zend-config/pull/45) adds the ability to specify an alternate key/value delimiter to
the JavaProperties config reader via the constructor: `$reader = new JavaProperties("=");`.

- [#42](https://github.com/zendframework/zend-config/pull/42) adds support for PHP 7.1 and 7.2.
- [zendframework/zend-config#42](https://github.com/zendframework/zend-config/pull/42) adds support for PHP 7.1 and 7.2.

### Changed

Expand All @@ -84,7 +84,7 @@ All notable changes to this project will be documented in this file, in reverse

### Removed

- [#42](https://github.com/zendframework/zend-config/pull/42) removes support for HHVM.
- [zendframework/zend-config#42](https://github.com/zendframework/zend-config/pull/42) removes support for HHVM.

### Fixed

Expand All @@ -94,12 +94,12 @@ All notable changes to this project will be documented in this file, in reverse

### Added

- [#37](https://github.com/zendframework/zend-config/pull/37) adds a new method,
- [zendframework/zend-config#37](https://github.com/zendframework/zend-config/pull/37) adds a new method,
`enableKeyProcessing()`, and constructor argument, `$enableKeyProcessing =
false`, to each of the `Token` and `Constant` processors. These allow enabling
processing of tokens and/or constants encountered in configuration key values.

- [#37](https://github.com/zendframework/zend-config/pull/37) adds the ability
- [zendframework/zend-config#37](https://github.com/zendframework/zend-config/pull/37) adds the ability
for the `Constant` processor to process class constants, including the
`::class` pseudo-constant.

Expand All @@ -119,41 +119,41 @@ All notable changes to this project will be documented in this file, in reverse

### Added

- [#36](https://github.com/zendframework/zend-config/pull/36) adds support for
- [zendframework/zend-config#36](https://github.com/zendframework/zend-config/pull/36) adds support for
[PSR-11](http://www.php-fig.org/psr/psr-11/).

- [#36](https://github.com/zendframework/zend-config/pull/36) adds the class
`Zend\Config\StandaloneReaderPluginManager` for managing config reader plugins.
- [zendframework/zend-config#36](https://github.com/zendframework/zend-config/pull/36) adds the class
`Laminas\Config\StandaloneReaderPluginManager` for managing config reader plugins.
This implementation implements the PSR-11 `ContainerInterface`, and uses a
hard-coded list of reader plugins.

- [#36](https://github.com/zendframework/zend-config/pull/36) adds the class
`Zend\Config\StandaloneWriterPluginManager` for managing config writer plugins.
- [zendframework/zend-config#36](https://github.com/zendframework/zend-config/pull/36) adds the class
`Laminas\Config\StandaloneWriterPluginManager` for managing config writer plugins.
This implementation implements the PSR-11 `ContainerInterface`, and uses a
hard-coded list of writer plugins.

### Changes

- [#36](https://github.com/zendframework/zend-config/pull/36) updates the
`Zend\Config\Factory::getReaderPluginManager()` method to lazy-load a
- [zendframework/zend-config#36](https://github.com/zendframework/zend-config/pull/36) updates the
`Laminas\Config\Factory::getReaderPluginManager()` method to lazy-load a
`StandaloneReaderPluginManager` by default, instead of a
`ReaderPluginManager`, allowing usage out-of-the-box without requiring
zend-servicemanager.
laminas-servicemanager.

- [#36](https://github.com/zendframework/zend-config/pull/36) updates the
`Zend\Config\Factory::setReaderPluginManager()` method to typehint against
- [zendframework/zend-config#36](https://github.com/zendframework/zend-config/pull/36) updates the
`Laminas\Config\Factory::setReaderPluginManager()` method to typehint against
`Psr\Container\ContainerInterface` instead of `ReaderPluginManager`. If you
were extending and overriding that method, you will need to update your
signature.

- [#36](https://github.com/zendframework/zend-config/pull/36) updates the
`Zend\Config\Factory::getWriterPluginManager()` method to lazy-load a
- [zendframework/zend-config#36](https://github.com/zendframework/zend-config/pull/36) updates the
`Laminas\Config\Factory::getWriterPluginManager()` method to lazy-load a
`StandaloneWriterPluginManager` by default, instead of a
`WriterPluginManager`, allowing usage out-of-the-box without requiring
zend-servicemanager.
laminas-servicemanager.

- [#36](https://github.com/zendframework/zend-config/pull/36) updates the
`Zend\Config\Factory::setWriterPluginManager()` method to typehint against
- [zendframework/zend-config#36](https://github.com/zendframework/zend-config/pull/36) updates the
`Laminas\Config\Factory::setWriterPluginManager()` method to typehint against
`Psr\Container\ContainerInterface` instead of `WriterPluginManager`. If you
were extending and overriding that method, you will need to update your
signature.
Expand All @@ -164,8 +164,8 @@ All notable changes to this project will be documented in this file, in reverse

### Removed

- [#36](https://github.com/zendframework/zend-config/pull/36) removes usage of
zend-json as a JSON de/serializer in the JSON writer and reader; the
- [zendframework/zend-config#36](https://github.com/zendframework/zend-config/pull/36) removes usage of
laminas-json as a JSON de/serializer in the JSON writer and reader; the
component now requires ext/json is installed to use these features.

### Fixed
Expand All @@ -176,12 +176,12 @@ All notable changes to this project will be documented in this file, in reverse

### Added

- [#6](https://github.com/zendframework/zend-config/pull/6) adds the ability for
- [zendframework/zend-config#6](https://github.com/zendframework/zend-config/pull/6) adds the ability for
the `PhpArray` writer to optionally translate strings that evaluate to known
classes to `ClassName::class` syntax; the feature works for both keys and
values.
- [#21](https://github.com/zendframework/zend-config/pull/21) adds revised
documentation, and publishes it to https://zendframework.github.io/zend-config/
- [zendframework/zend-config#21](https://github.com/zendframework/zend-config/pull/21) adds revised
documentation, and publishes it to https://docs.laminas.dev/laminas-config/

### Deprecated

Expand All @@ -193,11 +193,11 @@ All notable changes to this project will be documented in this file, in reverse

### Fixed

- [#8](https://github.com/zendframework/zend-config/pull/8),
[#18](https://github.com/zendframework/zend-config/pull/18), and
[#20](https://github.com/zendframework/zend-config/pull/20) update the
- [zendframework/zend-config#8](https://github.com/zendframework/zend-config/pull/8),
[zendframework/zend-config#18](https://github.com/zendframework/zend-config/pull/18), and
[zendframework/zend-config#20](https://github.com/zendframework/zend-config/pull/20) update the
code base to make it forwards-compatible with the v3.0 versions of
zend-stdlib and zend-servicemanager. Primarily, this involved:
laminas-stdlib and laminas-servicemanager. Primarily, this involved:
- Updating the `AbstractConfigFactory` to implement the new methods in the
v3 `AbstractFactoryInterface` definition, and updating the v2 methods to
proxy to those.
Expand All @@ -207,5 +207,5 @@ All notable changes to this project will be documented in this file, in reverse
the new `InvokableFactory`); additionally, they each now implement both
`validatePlugin()` from v2 and `validate()` from v3.
- Pinning to stable versions of already updated components.
- Selectively omitting zend-i18n-reliant tests when testing against
zend-servicemanager v3.
- Selectively omitting laminas-i18n-reliant tests when testing against
laminas-servicemanager v3.
2 changes: 2 additions & 0 deletions COPYRIGHT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Copyright (c) 2019, Laminas Foundation.
All rights reserved. (https://getlaminas.org/)
18 changes: 9 additions & 9 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
Copyright (c) 2005-2018, Zend Technologies USA, Inc.
Copyright (c) 2019, Laminas Foundation
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

- Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

- Redistributions in binary form must reproduce the above copyright notice, this
list of conditions and the following disclaimer in the documentation and/or
other materials provided with the distribution.
- Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

- Neither the name of Zend Technologies USA, Inc. nor the names of its
contributors may be used to endorse or promote products derived from this
software without specific prior written permission.
- Neither the name of Laminas Foundation nor the names of its contributors may
be used to endorse or promote products derived from this software without
specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# zend-config
# laminas-config

[![Build Status](https://secure.travis-ci.org/zendframework/zend-config.svg?branch=master)](https://secure.travis-ci.org/zendframework/zend-config)
[![Coverage Status](https://coveralls.io/repos/github/zendframework/zend-config/badge.svg?branch=master)](https://coveralls.io/github/zendframework/zend-config?branch=master)
[![Build Status](https://travis-ci.org/laminas/laminas-config.svg?branch=master)](https://travis-ci.org/laminas/laminas-config)
[![Coverage Status](https://coveralls.io/repos/github/laminas/laminas-config/badge.svg?branch=master)](https://coveralls.io/github/laminas/laminas-config?branch=master)

zend-config is designed to simplify access to configuration data within
laminas-config is designed to simplify access to configuration data within
applications. It provides a nested object property-based user interface for
accessing this configuration data within application code. The configuration
data may come from a variety of media supporting hierarchical data storage.

- File issues at https://github.com/zendframework/zend-config/issues
- Documentation is at https://docs.zendframework.com/zend-config/
- File issues at https://github.com/laminas/laminas-config/issues
- Documentation is at https://docs.laminas.dev/laminas-config/
Loading

0 comments on commit 293b1d8

Please sign in to comment.