Skip to content

Commit

Permalink
Merge pull request #6 from phalcongelist/1.2.x
Browse files Browse the repository at this point in the history
1.2.1
  • Loading branch information
sergeyklay committed Dec 20, 2016
2 parents c1ad725 + b61f17a commit d9df600
Show file tree
Hide file tree
Showing 21 changed files with 260 additions and 119 deletions.
18 changes: 18 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# EditorConfig is awesome: http://EditorConfig.org

# top-most EditorConfig file
root = true
charset = utf-8
trim_trailing_whitespace = true

[*]
indent_style = space
indent_size = 4
end_of_line = lf
insert_final_newline = true

[*.md]
trim_trailing_whitespace = false

[*.sh]
indent_style = tab
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
docs/* linguist-documentation

*.sql linguist-language=SQL
82 changes: 68 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,39 +1,93 @@
#
# Phalcon Breadcrumbs
#
# Copyright (c) 2016, Phalcon Team (https://www.phalconphp.com)
#
# This source file is subject to the New BSD License that is bundled
# with this package in the file LICENSE.txt
#
# If you did not receive a copy of the license and are unable to
# obtain it through the world-wide-web, please send an email
# to license@phalconphp.com so we can send you a copy immediately.
#
# Authors: Serghei Iakovlev <serghei@phalconphp.com>

language: php

sudo: required
dist: trusty

php:
- 5.5
- 5.6
- 7.0

group: stable
git:
depth: 1

env:
- PHALCON_VERSION="2.1.x"
- PHALCON_VERSION="phalcon-v2.0.10"
global:
- ZEND_DONT_UNLOAD_MODULES=1
- CC="ccache gcc"
- PATH="$PATH:~/bin"
matrix:
- PHALCON_VERSION="phalcon-v2.0.13"
- PHALCON_VERSION="v3.0.2"
- PHALCON_VERSION="v3.0.2" ZEND_BACKEND="--backend=ZendEngine3"

# multiple php version exclusion matrix
matrix:
fast_finish: true
exclude:
- env: PHALCON_VERSION="phalcon-v2.0.13"
php: 7.0
- env: PHALCON_VERSION="v3.0.2"
php: 7.0
- env: PHALCON_VERSION="v3.0.2" ZEND_BACKEND="--backend=ZendEngine3"
php: 5.5
- env: PHALCON_VERSION="v3.0.2" ZEND_BACKEND="--backend=ZendEngine3"
php: 5.6

cache:
apt: true
ccache: true
timeout: 691200
directories:
- .temp
- vendor
- $HOME/.ccache
- $HOME/.composer/cache

before_install:
- git clone -q --depth=1 https://github.com/phalcon/cphalcon.git -b ${PHALCON_VERSION}
- (cd cphalcon/ext; export CFLAGS="-g0 -O0 -std=gnu90"; phpize &> /dev/null && ./configure --silent --enable-phalcon &> /dev/null && make --silent -j2 &> /dev/null && make --silent install)
- phpenv config-add tests/_ci/phalcon.ini &> /dev/null
- php --ri phalcon
- travis_retry composer self-update -q
- phpenv config-rm xdebug.ini || true
- sudo ln -s /home/travis/.phpenv/versions/$(phpenv version-name)/bin/phpize /usr/bin/
- sudo ln -s /home/travis/.phpenv/versions/$(phpenv version-name)/bin/php-config /usr/bin/
- if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi;
- travis_retry composer install --prefer-dist --no-interaction --ignore-platform-reqs
- ulimit -c unlimited -S || true
- stty cols 160
- travis_retry composer install --prefer-dist --no-interaction --ignore-platform-reqs &> /dev/null
- travis_retry composer require --dev "phalcon/zephir:dev-master" --ignore-platform-reqs &> /dev/null
- ( bash tests/_ci/install_zephir.sh )

install:
- git clone -q --depth=1 https://github.com/phalcon/cphalcon.git -b ${PHALCON_VERSION} &> /dev/null
- ln -s ${TRAVIS_BUILD_DIR}/.temp ${TRAVIS_BUILD_DIR}/cphalcon/.temp
- ( cd cphalcon; zephir fullclean && zephir generate $ZEND_BACKEND &> /dev/null )
- ( cd cphalcon/ext; export CFLAGS="-g3 -O1 -std=gnu90 -Wall -DZEPHIR_RELEASE=1"; /usr/bin/phpize &> /dev/null && ./configure --silent --enable-phalcon &> /dev/null && make --silent -j2 &> /dev/null && make --silent install )
- phpenv config-add tests/_ci/phalcon.ini

script:
- vendor/bin/phpcs --standard=PSR2 --colors --extensions=php --encoding=utf-8 src/
- vendor/bin/codecept build
- vendor/bin/phpcs
- vendor/bin/codecept build &> /dev/null
- vendor/bin/codecept run

notifications:
email:
recipients:
- serghei@phalconphp.com
- build@phalconphp.com
on_success: change
on_failure: always

addons:
apt:
packages:
- gdb
- re2c
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# [1.2.2](https://github.com/phalcongelist/breadcrumbs/releases/tag/v1.2.2) (XXXX-XX-XX)

# [1.2.1](https://github.com/phalcongelist/breadcrumbs/releases/tag/v1.2.1) (2016-11-15)
* Updated dev-dependencies
* Minor grammar improvements
* Refactored test environment

# [1.2.0](https://github.com/phalcongelist/breadcrumbs/releases/tag/v1.2.0) (2016-03-26)
* PHP 5.4 is now fully deprecated
* Added `Breadcrumbs::count`
Expand Down
11 changes: 3 additions & 8 deletions docs/LICENSE.txt → LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,9 @@ All rights reserved.

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.
* Neither the name of the Phalcon nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
* 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.
* Neither the name of the Phalcon 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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -232,4 +232,4 @@ Phalcon Breadcrumbs is open-sourced software licensed under the [New BSD License

[:composer:]: https://getcomposer.org/
[:phalcon:]: https://github.com/phalcon/cphalcon/releases
[:license:]: https://github.com/phalcongelist/breadcrumbs/blob/master/docs/LICENSE.md
[:license:]: https://github.com/phalcongelist/breadcrumbs/blob/master/LICENSE.txt
6 changes: 1 addition & 5 deletions codeception.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,7 @@ settings:
# Tests (especially functional) can take a lot of memory
# We set a high limit for them by default.
memory_limit: 1024M
coverage:
enabled: true
whitelist:
include:
- src/*.php

extensions:
enabled:
- Codeception\Extension\RunFailed
Expand Down
77 changes: 38 additions & 39 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,45 +1,44 @@
{
"name": "phalcongelist/breadcrumbs",
"description": "Powerful and flexible component for building site breadcrumbs in Phalcon 2+.",
"keywords": ["phalcon", "breadcrumbs", "crumbs"],
"type": "library",
"license": "BSD-3-Clause",
"homepage": "https://github.com/phalcongelist/breadcrumbs",
"authors": [
{
"name": "Serghei Iakovlev",
"email": "serghei@phalconphp.com",
"role": "developer"
"name": "phalcongelist/breadcrumbs",
"description": "Powerful and flexible component for building site breadcrumbs in Phalcon 2+.",
"keywords": [
"phalcon",
"breadcrumbs",
"crumbs"
],
"type": "library",
"license": "BSD-3-Clause",
"homepage": "https://github.com/phalcongelist/breadcrumbs",
"authors": [
{
"name": "Serghei Iakovlev",
"email": "serghei@phalconphp.com",
"role": "developer"
},
{
"name": "Contributors",
"homepage": "https://github.com/phalcongelist/breadcrumbs/graphs/contributors"
}
],
"support": {
"source": "https://github.com/phalcongelist/breadcrumbs",
"issues": "https://github.com/phalcongelist/breadcrumbs/issues",
"wiki": "https://github.com/phalcongelist/breadcrumbs/wiki",
"forum": "https://forum.phalconphp.com/"
},
{
"name": "Contributors",
"homepage": "https://github.com/phalcongelist/breadcrumbs/graphs/contributors"
}
],
"support": {
"source": "https://github.com/phalcongelist/breadcrumbs",
"issues": "https://github.com/phalcongelist/breadcrumbs/issues",
"wiki": "https://github.com/phalcongelist/breadcrumbs/wiki",
"forum": "https://forum.phalconphp.com/"
},
"require": {
"php": ">= 5.4",
"ext-phalcon": ">=2.0"
},
"require-dev": {
"squizlabs/php_codesniffer": "^2.5",
"codeception/codeception": "^2.1",
"require": {
"php": ">= 5.5",
"ext-phalcon": ">=2.0 <4.0"
},
"require-dev": {
"squizlabs/php_codesniffer": "^2.6",
"codeception/codeception": "^2.2",
"codeception/specify": "^0.4",
"codeception/verify": "^0.3"
},
"autoload": {
"psr-4": {
"Phalcon\\": "src/"
}
},
"extra": {
"branch-alias": {
"dev-master": "1.1.x-dev"
},
"autoload": {
"psr-4": {
"Phalcon\\": "src/"
}
}
}
}
27 changes: 0 additions & 27 deletions docs/LICENSE.md

This file was deleted.

31 changes: 31 additions & 0 deletions phpcs.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0"?>
<ruleset name="Phalcon Breadcrumbs">

<!--
The name attribute of the ruleset tag is displayed
when running PHP_CodeSniffer with the -v command line
argument. The description tag below is not displayed anywhere
except in this file, so it can contain information for
developers who may change this file in the future.
-->

<description>Phalcon Breadcrumbs Coding Standards</description>

<!-- Show colors in console -->
<arg value="-colors"/>

<!-- Show sniff codes in all reports -->
<arg value="s"/>

<!-- Use PSR-2 as a base -->
<rule ref="PSR2"/>

<!--
If no files or directories are specified on the command line
your custom standard can specify what files should be checked
instead.
Note that specifying any file or directory path
on the command line will ignore all file tags.
-->
<file>src</file>
</ruleset>
Loading

0 comments on commit d9df600

Please sign in to comment.