Skip to content

Commit

Permalink
BUGFIX Travis phpcs config (#15)
Browse files Browse the repository at this point in the history
  • Loading branch information
jsirish committed Oct 30, 2019
1 parent 6593c33 commit 8e95f3e
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ before_script:
script:
- if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi
- if [[ $PHPUNIT_COVERAGE_TEST ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml; fi
- if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs src/ tests/ *.php; fi
- if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs src/ tests/; fi

after_success:
- if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml -F php; fi
- if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml -F php; fi
31 changes: 31 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Changelog

## [1.0.0](https://github.com/dynamic/silverstripe-foxy-single-sign-on/tree/1.0.0) (2019-10-30)

[Full Changelog](https://github.com/dynamic/silverstripe-foxy-single-sign-on/compare/43bab7bc75cc94eda4a498b254edf68425d46df7...1.0.0)

**Implemented enhancements:**

- FEATURE SSO endpoint for Foxy Auto Login [\#6](https://github.com/dynamic/silverstripe-foxy-single-sign-on/issues/6)
- FEATURE Member creation from Foxy datafeed [\#5](https://github.com/dynamic/silverstripe-foxy-single-sign-on/issues/5)

**Fixed bugs:**

- BUG memberfactory.yml declares "customer\_email" twice [\#12](https://github.com/dynamic/silverstripe-foxy-single-sign-on/issues/12)
- Composer - require foxy-api [\#1](https://github.com/dynamic/silverstripe-foxy-single-sign-on/issues/1)

**Merged pull requests:**

- BUGFIX use sha1\_v2.4 for hash method [\#14](https://github.com/dynamic/silverstripe-foxy-single-sign-on/pull/14) ([muskie9](https://github.com/muskie9))
- BUGFIX duplicate email mapping [\#13](https://github.com/dynamic/silverstripe-foxy-single-sign-on/pull/13) ([muskie9](https://github.com/muskie9))
- BUGFIX MemberFactory - update references from $order to $customer [\#11](https://github.com/dynamic/silverstripe-foxy-single-sign-on/pull/11) ([jsirish](https://github.com/jsirish))
- BUGFIX CustomerExtension - add data checks before setting Customer\_ID [\#10](https://github.com/dynamic/silverstripe-foxy-single-sign-on/pull/10) ([jsirish](https://github.com/jsirish))
- FEATURE MemberFactory [\#9](https://github.com/dynamic/silverstripe-foxy-single-sign-on/pull/9) ([jsirish](https://github.com/jsirish))
- skeleton file cleanup [\#8](https://github.com/dynamic/silverstripe-foxy-single-sign-on/pull/8) ([jsirish](https://github.com/jsirish))
- FEATURE SSO Endpoint [\#7](https://github.com/dynamic/silverstripe-foxy-single-sign-on/pull/7) ([jsirish](https://github.com/jsirish))
- Jenkins CI setup [\#4](https://github.com/dynamic/silverstripe-foxy-single-sign-on/pull/4) ([jsirish](https://github.com/jsirish))
- BUGFIX composer remove expose [\#3](https://github.com/dynamic/silverstripe-foxy-single-sign-on/pull/3) ([jsirish](https://github.com/jsirish))



\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@

An add-on module for SilverStripe Foxy that allows single sign on with your Foxy shop.

[![Build Status](https://travis-ci.org/dynamic/silverstripe-foxy-single-sign-on.svg?branch=master)](https://travis-ci.org/dynamic/silverstripe-foxy-single-sign-on)
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/dynamic/silverstripe-foxy-single-sign-on/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/dynamic/silverstripe-foxy-single-sign-on/?branch=master)
[![Build Status](https://scrutinizer-ci.com/g/dynamic/silverstripe-foxy-single-sign-on/badges/build.png?b=master)](https://scrutinizer-ci.com/g/dynamic/silverstripe-foxy-single-sign-on/build-status/master)
[![codecov](https://codecov.io/gh/dynamic/silverstripe-foxy-single-sign-on/branch/master/graph/badge.svg)](https://codecov.io/gh/dynamic/silverstripe-foxy-single-sign-on)

[![Latest Stable Version](https://poser.pugx.org/dynamic/silverstripe-foxy-single-sign-on/v/stable)](https://packagist.org/packages/dynamic/silverstripe-foxy-single-sign-on)
[![Total Downloads](https://poser.pugx.org/dynamic/silverstripe-foxy-single-sign-on/downloads)](https://packagist.org/packages/dynamic/silverstripe-foxy-single-sign-on)
[![Latest Unstable Version](https://poser.pugx.org/dynamic/silverstripe-foxy-single-sign-on/v/unstable)](https://packagist.org/packages/dynamic/silverstripe-foxy-single-sign-on)
[![License](https://poser.pugx.org/dynamic/silverstripe-foxy-single-sign-on/license)](https://packagist.org/packages/dynamic/silverstripe-foxy-single-sign-on)

## Requirements

Expand Down
6 changes: 4 additions & 2 deletions src/Factory/MemberFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,10 @@ protected function setMember()
$transaction = $this->getTransaction()->getParsedTransactionData()->getField('transaction');

// if not a guest transaction in Foxy
if ($transaction->getField('customer_email')
&& $transaction->getField('is_anonymous') == 0) {
if (
$transaction->getField('customer_email')
&& $transaction->getField('is_anonymous') == 0
) {

/** @var $encryption - disable password encryption to prevent double encryption */
$encryption = Config::inst()->get(Security::class, 'password_encryption_algorithm');
Expand Down

0 comments on commit 8e95f3e

Please sign in to comment.