Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Commit 3b90874

Browse files
authored
Merge pull request #17 from lildude/modernising-phpzenfolio
Bring phpZenfolio into the 21st Century
2 parents 2018677 + afd8057 commit 3b90874

30 files changed

+1848
-2561
lines changed

.editorconfig

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# This file is for unifying the coding style for different editors and IDEs
2+
# editorconfig.org
3+
4+
# PHP PSR-2 Coding Standards
5+
# http://www.php-fig.org/psr/psr-2/
6+
7+
root = true
8+
9+
[*.php]
10+
charset = utf-8
11+
end_of_line = lf
12+
insert_final_newline = true
13+
trim_trailing_whitespace = true
14+
indent_style = space
15+
indent_size = 4

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
vendor
2+
composer.lock
3+
composer.phar
4+
/build
5+
_site/

.travis.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
language: php
2+
sudo: true
3+
php:
4+
- '5.6'
5+
- '7.0'
6+
before_install:
7+
# We need this because Zenfolio uses a Comodo/AddTrust certificate not trusted by default.
8+
- echo -n | openssl s_client -connect api.zenfolio.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-certificates.crt
9+
- composer self-update
10+
11+
install:
12+
- composer install
13+
14+
script:
15+
- vendor/bin/phpunit -v
16+
17+
after_script:
18+
- vendor/bin/coveralls -v

CHANGELOG.md

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# Change Log
2+
All notable changes to this project will be documented in this file.
3+
As of 2.0.0, this project adheres to [Semantic Versioning](http://semver.org/) and the format is based on the suggestions a <http://keepachangelog.com/>.
4+
5+
## [2.0.0] - 2016-10-16
6+
### Added
7+
- A new example showing how to create a gallery and upload an image to it.
8+
9+
### Changed
10+
- Complete rewrite of phpZenfolio.
11+
- phpZenfolio 2.0.0 is _not_ backwardly compatible with phpZenfolio 1.x and earlier.
12+
- Implemented proper semantic versioning.
13+
- Switched to using Guzzle for requests to the API. This means more reliable and predictable behaviour and allows for easier future improvements in phpZenfolio without having to worry about maintaining a library that submits requests.
14+
- All requests, except image uploads, use HTTPS. Zenfolio has not implemented image uploads over HTTPS yet.
15+
- Requires PHP 5.6.0 or later.
16+
- All tests are now public and run on Travis CI with every push.
17+
- Licensed under the MIT license.
18+
- Documentation has been split out of the README.md into individual files and moved to a dedicated directory.
19+
- All documentation is licensed under the CC BY 4.0 license.
20+
- PSR-1, PSR-2, and PSR-4 coding standards are implemented and enforced by unit testing.
21+
22+
### Removed
23+
- Caching has been removed from phpZenfolio as there are better Guzzle-friendly implementations that tie-in with phpZenfolio thanks to the use of Guzzle.
24+
25+
## [1.3] - 2016-04-16
26+
### Changed
27+
- Default API version is now 1.8 and the rest of the library takes this API version into account.
28+
- The README is Markdown instead of plaintext.
29+
30+
## [1.2] - 2012-06-10
31+
### Added
32+
- Ability to perform ALL API requests over HTTPS (Ticket #4)
33+
34+
### Changed
35+
- The API endpoint uses api.zenfolio.com as requested by Zenfolio
36+
- The default API version is now 1.6
37+
38+
## [1.1] - 2011-03-28
39+
### Changed
40+
- Cache only successful requests
41+
- Improved connection settings
42+
43+
### Fixed
44+
- Use md5 to generate a uniq ID for each request instead of using `intval()` to ensure correct and consistent behaviour on 32-bit and 64-bit platforms. (Ticket #1)
45+
- Corrected check for safe_dir OR open_basedir so fails over to socket connection correctly (Ticket #2)
46+
47+
### Removed
48+
- Removed erroneous re-instantiation of processor when setting adapter.
49+
50+
## [1.0] - 2010-10-01
51+
- Initial release.

CONTRIBUTING.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Contributing to phpZenfolio
2+
3+
## The Get Going Quick Guide
4+
5+
1. Fork the phpZenfolio repository on [GitHub](https://github.com/lildude/phpZenfolio).
6+
2. If you're submitting a fix or improvement to the phpZenfolio code or submitting a new example, create a new branch from the `master` branch, for example: `your-fork/some-cool-feature` or `your-fork/fixing-something-broken` branch.
7+
3. If you're submitting a fix or improvement to the phpZenfolio website or documentation, create a new branch from the `gh-pages` branch.
8+
4. If you're submitting code changes, as opposed to documentation, write tests that fail without your changes and pass with them.
9+
5. Ensure all tests pass locally by running: `vendor/bin/phpunit` within your local clone of the repository.
10+
6. Submit a [pull request](https://help.github.com/articles/using-pull-requests/).
11+
12+
All pull requests will be reviewed and will be merged once all tests have passed.
13+
14+
# Coding Standards
15+
16+
To try and keep things looking :sparkles:, please ensure your changes comply with the following coding standards:
17+
18+
* [PSR-1: Basic Coding Standard](http://www.php-fig.org/psr/psr-1/)
19+
* [PSR-2: Coding Style Guide](http://www.php-fig.org/psr/psr-2/)
20+
* [PSR-4: Improved Autoloading](http://www.php-fig.org/psr/psr-4/)
21+
22+
All contributions are automatically checked against these standards using [php-cs-fixer](http://cs.sensiolabs.org/).
23+
24+
# Licensing
25+
26+
By contributing code you agree to license your contribution under the [MIT license](https://opensource.org/licenses/MIT).
27+
28+
By contributing documentation, examples, or any other non-code assets you agree to license your contribution under the [CC BY 4.0 license](https://creativecommons.org/licenses/by/4.0/). Attribution shall be given according to the current bylaws of this group.

0 commit comments

Comments
 (0)