Skip to content

Commit 0190d47

Browse files
authored
Merge pull request #1 from PHPSocialNetwork/final
Up
2 parents 488ed65 + a892785 commit 0190d47

File tree

261 files changed

+14489
-2392
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

261 files changed

+14489
-2392
lines changed

.codeclimate.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,5 @@ ratings:
5454
exclude_paths:
5555
- "bin/**"
5656
- "examples/**"
57+
- "docs/**"
5758
- "tests/**"

.github/CONTRIBUTING.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
Contributing to PhpFastCache
2+
========================
3+
4+
Please note that this project is released with a
5+
[Contributor Code of Conduct](http://contributor-covenant.org/version/1/4/).
6+
By participating in this project you agree to abide by its terms.
7+
8+
Reporting Issues
9+
----------------
10+
11+
When reporting issues, please try to be as descriptive as possible, and include
12+
as much relevant information as you can. A step by step guide on how to
13+
reproduce the issue will greatly increase the chances of your issue being
14+
resolved in a timely manner.
15+
16+
Contributing policy
17+
-------------------
18+
19+
Fork the project, create a feature branch, and send us a pull request.
20+
21+
To ensure a consistent code base, you should make sure the code follows
22+
the [PSR-2 Coding Standards](http://www.php-fig.org/psr/psr-2/). You can also
23+
run [php-cs-fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer) with the
24+
configuration file that can be found in the project root directory.
25+
26+
If you would like to help, take a look at the [list of open issues](https://github.com/PHPSocialNetwork/phpfastcache/issues).

.github/ISSUE_TEMPLATE.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
### Configuration:
2+
3+
PhpFastCache version: ` ...replace me... `
4+
PHP version: ` ...replace me... `
5+
Operating system: ` ...replace me... `
6+
7+
#### Issue description:
8+
9+
> ... Your description goes here ...
10+
... You can also read the [wiki](https://github.com/PHPSocialNetwork/phpfastcache/wiki) ...

.gitignore

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,12 @@ build/
7070
*.tlb
7171
*.tli
7272
*.tlh
73-
*.tmp
7473
*.tmp_proj
7574
*.log
7675
*.vspscc
7776
*.vssscc
7877
.builds
7978
*.pidb
80-
*.log
8179
*.scc
8280

8381
# Visual C++ cache files
@@ -196,7 +194,6 @@ $RECYCLE.BIN/
196194
*.egg
197195
*.egg-info
198196
dist/
199-
build/
200197
eggs/
201198
parts/
202199
# var/
@@ -233,4 +230,5 @@ nbproject/
233230
#Composer
234231
vendor/
235232
# composer.lock
236-
composer.phar
233+
composer.phar
234+
/cache/

.scrutinizer.yml

Lines changed: 49 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,51 @@
1-
before_commands:
2-
- "composer install --no-dev --prefer-source"
1+
#
2+
# This file is part of phpFastCache.
3+
#
4+
# @license MIT License (MIT)
5+
#
6+
# For full copyright and license information, please see the docs/CREDITS.txt file.
7+
#
8+
# @author Khoa Bui (khoaofgod) <[email protected]> http://www.phpfastcache.com
9+
# @author Georges.L (Geolim4) <[email protected]>
10+
#
311

4-
filter:
5-
excluded_paths: ["bin/*", "docs/*", "examples/*", "var/*", "vendor/*"]
6-
checks:
7-
php: true
8-
coding_style:
9-
php:
10-
spaces:
11-
around_operators:
12-
concatenation: true
12+
before_commands:
13+
- "composer install --no-dev --prefer-source"
14+
- "composer require predis/predis \"~1.1.0\""
15+
- "composer require mongodb/mongodb \"^1.1\""
16+
- "composer require phpfastcache/phpssdb ~1.0.0\""
17+
- "composer require phpfastcache/couchdb \"~1.0.0\""
18+
build:
19+
environment:
20+
php:
21+
version: 5.6
22+
checks:
23+
php: true
24+
coding_style:
25+
php:
26+
spaces:
27+
around_operators:
28+
concatenation: true
29+
filter:
30+
excluded_paths:
31+
- bin/*
32+
- docs/*
33+
- examples/*
34+
- var/*
35+
- vendor/*
36+
- tests/*
1337
tools:
14-
external_code_coverage: false
15-
php_code_coverage: true
16-
php_code_sniffer:
17-
enabled: true
18-
config:
19-
standard: PSR2
20-
filter:
21-
paths: ["src/*"]
22-
php_mess_detector:
23-
enabled: true
24-
filter:
25-
paths: ["src/*"]
38+
external_code_coverage: false
39+
php_code_coverage: true
40+
php_code_sniffer:
41+
config:
42+
standard: PSR2
43+
enabled: true
44+
filter:
45+
paths:
46+
- src/*
47+
php_mess_detector:
48+
enabled: true
49+
filter:
50+
paths:
51+
- src/*

.travis.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,29 @@
1010
#
1111
sudo: false
1212

13+
dist: trusty
14+
1315
language: php
1416

1517
services:
1618
- memcached
17-
# - redis-server
19+
- redis-server
20+
- couchdb
1821
before_script:
1922
- |
2023
if [[ $TRAVIS_PHP_VERSION = "hhv"* ]]; then
21-
cat var/php/conf/phpfastcache.ini >> /etc/hhvm/php.ini
24+
cat bin/ci/php_phpfastcache.ini >> /etc/hhvm/php.ini
2225
else
23-
phpenv config-add var/php/conf/phpfastcache.ini
26+
phpenv config-add bin/ci/php_phpfastcache.ini
2427
fi
2528
2629
php:
2730
# - 5.3
2831
# - 5.4
29-
- 5.5
32+
# - 5.5
3033
- 5.6
3134
- 7.0
35+
- 7.1
3236
- nightly
3337
- hhvm
3438

@@ -42,9 +46,4 @@ install:
4246
- ./bin/ci/install_dependencies.sh
4347

4448
script:
45-
- php -f tests/SyntaxChecker.test.php
46-
- php -f tests/Autoload.test.php
47-
- php -f tests/NewCacheInstance.test.php
48-
- php -f tests/Psr6InterfaceImplements.test.php
49-
- php -f tests/AbstractProxy.test.php
50-
- php -f tests/AttachingDetachingMethods.test.php
49+
- php -f bin/ci/run_tests.php

CODE_OF_CONDUCT.md

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
6+
7+
## Our Standards
8+
9+
Examples of behavior that contributes to creating a positive environment include:
10+
11+
* Using welcoming and inclusive language
12+
* Being respectful of differing viewpoints and experiences
13+
* Gracefully accepting constructive criticism
14+
* Focusing on what is best for the community
15+
* Showing empathy towards other community members
16+
17+
Examples of unacceptable behavior by participants include:
18+
19+
* The use of sexualized language or imagery and unwelcome sexual attention or advances
20+
* Trolling, insulting/derogatory comments, and personal or political attacks
21+
* Public or private harassment
22+
* Publishing others' private information, such as a physical or electronic address, without explicit permission
23+
* Other conduct which could reasonably be considered inappropriate in a professional setting
24+
25+
## Our Responsibilities
26+
27+
Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
28+
29+
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
30+
31+
## Scope
32+
33+
This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
34+
35+
## Enforcement
36+
37+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
38+
39+
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
40+
41+
## Attribution
42+
43+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
44+
45+
[homepage]: http://contributor-covenant.org
46+
[version]: http://contributor-covenant.org/version/1/4/

LICENCE

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Copyright (c) 2016 phpFastCache
2+
3+
Permission is hereby granted, free of charge, to any person obtaining
4+
a copy of this software and associated documentation files (the
5+
Software), to deal in the Software without restriction, including
6+
without limitation the rights to use, copy, modify, merge, publish,
7+
distribute, sublicense, and/or sell copies of the Software, and to
8+
permit persons to whom the Software is furnished to do so, subject to
9+
the following conditions:
10+
11+
The above copyright notice and this permission notice shall be
12+
included in all copies or substantial portions of the Software.
13+
14+
THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND,
15+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
17+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
18+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
19+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
20+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

0 commit comments

Comments
 (0)