Feature/structure upgrade

.editorconfig

@@ -4,7 +4,10 @@ root = true
 [*]
 charset = utf-8
 end_of_line = lf
-indent_size = 4
+indent_size = 2
 indent_style = space
+
+[*.php]
+indent_size = 4
 insert_final_newline = true
 trim_trailing_whitespace = true

.gitattributes

@@ -1,14 +1,27 @@
-*                       text=auto
 *.java        eol=lf    text       ident  diff=java
 *.c           eol=lf    text       ident  diff=cpp
 *.h           eol=lf    text       ident  diff=cpp
 *.cpp         eol=lf    text       ident  diff=cpp
 *.xml         eol=lf    text       ident  diff=html
 *.vm                    text       ident
 *.php         eol=lf    text       ident  diff=php
+*.phps        eol=lf    text       ident  diff=php
 *.properties            text       ident
-*.js                    text       ident  diff=html
-*.css                   text       ident  diff=html
+*.js          eol=lf    text       ident  diff=java
+*.json        eol=lf    text       ident  diff=java
+*.css         eol=lf    text       ident  diff=html
 *.sh          eol=lf    text       ident
 *.bat         eol=crlf  text       ident
-*.vcproj      eol=crlf  text       ident
+*.cmd         eol=crlf  text       ident
+*.vcproj      eol=crlf  text       ident
+*.md          eol=lf    text       ident  diff=html
+*.gif                   binary
+*.png                   binary
+*.jpg                   binary
+*.jar                   binary
+*.class                 binary
+*.gz                    binary
+*.tar                   binary
+*.dll                   binary
+*.exe                   binary
+*.zip                   binary

.gitignore

@@ -1,69 +1,8 @@
-### PhpStorm ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
-
-*.iml
-
-## Directory-based project format:
-.idea/
-
-## File-based project format:
-*.ipr
-*.iws
-
-## Plugin-specific files:
-
-# IntelliJ
-out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-
-### Windows ###
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
-
-# Folder config file
-Desktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
-# Project specific
+# clickalicious
 __*/
-docs/coverage/*
+build/*
 bin/*
 
-# Common
-*.bak
-*.tmp
-*.log
-*.old
-.settings
-.buildpath
-.project
-.externalToolBuilders
-
 # Composer
 vendor/
 composer.lock
-
-# Node & npm
-npm_modules/

.styleci.yml

@@ -0,0 +1,9 @@
+preset: symfony
+
+risky: true
+
+finder:
+  exclude:
+    - "tests"
+  name:
+    - "*.php"

.travis.yml

@@ -1,16 +1,17 @@
 language: php
 
 php:
-  - 5.4
-  - 5.5
   - 5.6
   - 7.0
+  - 7.1
+  - nightly
   - hhvm
 
 sudo: false
 
 matrix:
   allow_failures:
+    - php: nightly
     - php: hhvm
   fast_finish: true
 
@@ -26,29 +27,28 @@ env:
   - PREFER_LOWEST=""
 
 before_script:
-  - composer update --prefer-dist $PREFER_LOWEST
+  - composer update --ignore-platform-reqs --prefer-dist $PREFER_LOWEST
   - composer --optimize-autoloader --no-interaction
 
 script:
-  - bin/phpunit -c tests/ --coverage-clover=coverage.clover --coverage-html=./docs/coverage
+  - bin/phpunit --configuration . --coverage-clover=build/logs/clover.xml --coverage-html=build/html/coverage
 
 after_script:
-  # We upload only for reference platform! This is our base for further code analyses and so on.
-  - if [ $(phpenv version-name) == "5.4" ] && [ "$PREFER_LOWEST" == "--prefer-lowest" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
-  - if [ $(phpenv version-name) == "5.4" ] && [ "$PREFER_LOWEST" == "--prefer-lowest" ]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover > /dev/null 2>&1; fi
+  - if [ $(phpenv version-name) == "5.6" ] && [ "$PREFER_LOWEST" == "--prefer-lowest" ]; then bin/codacycoverage clover build/logs/clover.xml > /dev/null 2>&1; fi
+  - if [ $(phpenv version-name) == "5.6" ] && [ "$PREFER_LOWEST" == "--prefer-lowest" ]; then cat build/logs/clover.xml; fi
 
 after_success:
   # Push coverage to github pages branch
   - chmod +x ./update-gh-pages.sh
-  - if [ $(phpenv version-name) == "5.4" ] && [ "$PREFER_LOWEST" == "--prefer-lowest" ]; then bash ./update-gh-pages.sh; fi
+  - if [ $(phpenv version-name) == "5.6" ] && [ "$PREFER_LOWEST" == "--prefer-lowest" ]; then bash ./update-gh-pages.sh; fi
   # CREATE GIT TAG
   - git config --global user.email "[email protected]"
   - git config --global user.name "Travis"
   - export GIT_TAG=build-$TRAVIS_BRANCH-$(date -u "+%Y-%m-%d")-$TRAVIS_BUILD_NUMBER
   - echo -n $GIT_TAG > public/version
   - git commit -m "Set build VERSION number" public/version
   - git tag $GIT_TAG -a -m "Generated tag from TravisCI build $TRAVIS_BUILD_NUMBER"
-  - git push --tags --quiet https://[email protected]/clickalicious/Memcached.php > /dev/null 2>&1
+  - git push --tags --quiet https://[email protected]/clickalicious/memcached-php > /dev/null 2>&1
 
 # Blacklist the pushed tag from above to prevent black hole
 branches:
@@ -57,7 +57,8 @@ branches:
 
 # Who to notify?
 notifications:
-  slack: clickalicious:$SLACKKEY
+  slack:
+    secure: UFIXK2u7xalPWZppJ+X8aU9qjHWompS6qpBxyjYd8NyYIdTC8HvrovatS150F/b0QUnZXGaHe416vmooKRVDv6JgsR+v+sf/XAiAsc/vPSDO734zWZgubQCF3+jmKV2rD7OGnHgn/LBnREJhF26o10ox3A2UQ3G4kkFwP1q+i6g=
   email:
     recipients:
-      - [email protected]
+      - [email protected]