Skip to content

Commit 0869c91

Browse files
committed
merged with latest in master
2 parents 86b8f7f + 99c931c commit 0869c91

File tree

11 files changed

+21
-10
lines changed

11 files changed

+21
-10
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
- 6379:6379
2020
strategy:
2121
matrix:
22-
version: ['7.4', '8.0', '8.2']
22+
version: ['7.4', '8.0', '8.1', '8.2']
2323
steps:
2424
- name: Checkout code
25-
uses: actions/checkout@v2
25+
uses: actions/checkout@v3
2626

2727
- name: Setup PHP
2828
uses: shivammathur/setup-php@v2
@@ -48,7 +48,7 @@ jobs:
4848
runs-on: ubuntu-latest
4949
steps:
5050
- name: Checkout code
51-
uses: actions/checkout@v2
51+
uses: actions/checkout@v3
5252
with:
5353
fetch-depth: 0
5454

.github/workflows/update-license-year.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v3
1717
with:
1818
fetch-depth: 0
1919

CHANGES.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
8.0.0 (Jan XX, 2023)
1+
8.0.0 (Feb XX, 2023)
22
- BREAKING CHANGE: Removed support from versions older than PHP 7.4.
33
- BREAKING CHANGE: Added support for Multiple Factory Instantiation.
44

5+
7.1.6 (Feb 14, 2023)
6+
- Fixed logging on array conversion.
7+
58
7.1.5 (Oct 28, 2022)
69
- Updated phpdocs for `ClientInterface`.
710

src/SplitIO/Component/Cache/SplitCache.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function getSplit($splitName)
6868
*/
6969
public function getSplits($splitNames)
7070
{
71-
$cacheItems = $this->cache->fetchMany(array_map('self::getCacheKeyForSplit', $splitNames));
71+
$cacheItems = $this->cache->fetchMany(array_map(self::class . '::getCacheKeyForSplit', $splitNames));
7272
$toReturn = array();
7373
foreach ($cacheItems as $key => $value) {
7474
$toReturn[self::getSplitNameFromCacheKey($key)] = $value;

src/SplitIO/Component/Log/Logger.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ public function __construct(LogHandlerInterface $handler = null, $level = LogLev
5959
public function log($level, $message, array $context = array())
6060
{
6161
if ($this->logLevels[$level] <= $this->logLevel) {
62+
if (is_array($message)) {
63+
$message = json_encode($message);
64+
}
6265
$this->handler->write($level, $message);
6366
}
6467
}

src/SplitIO/Grammar/Condition/Matcher/ContainsString.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ class ContainsString extends AbstractMatcher
77
{
88
protected $ContainsStringMatcherData = null;
99

10+
private $containsStringMatcherData;
11+
1012
public function __construct($data, $negate = false, $attribute = null)
1113
{
1214
parent::__construct(Matcher::CONTAINS_STRING, $negate, $attribute);

src/SplitIO/Sdk/Client.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ class Client implements ClientInterface
1616

1717
private $evaluator = null;
1818
private $impressionListener = null;
19+
private $queueMetadata = null;
1920

2021
/**
2122
* Flag to get Impression's labels feature enabled
@@ -39,13 +40,13 @@ class Client implements ClientInterface
3940
private $impressionCache;
4041

4142
/**
42-
* @var \SplitIO\Component\Cache\EventCache
43+
* @var \SplitIO\Component\Cache\EventsCache
4344
*/
4445
private $eventCache;
4546

4647
/**
47-
* @param array $options
4848
* @param array $storages
49+
* @param array $options
4950
*/
5051
public function __construct($storages, $options = array())
5152
{

src/SplitIO/Sdk/Events/EventDTO.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ class EventDTO
1010
private $eventTypeId;
1111
private $value;
1212
private $timestamp;
13+
private $properties;
1314

1415
public function __construct($key, $trafficTypeName, $eventTypeId, $value, $properties)
1516
{

src/SplitIO/Sdk/Factory/SplitFactory.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ class SplitFactory implements SplitFactoryInterface
3737

3838
/**
3939
* @param string $apiKey
40+
* @param Pool $cache
4041
* @param array $options
4142
*/
4243
public function __construct($apiKey, Pool $cache, array $options = array())

src/SplitIO/Version.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33

44
class Version
55
{
6-
const CURRENT = '8.0.0-rc1';
6+
const CURRENT = '8.0.0-rc2';
77
}

tests/Suite/Sdk/SdkReadOnlyTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public function testException()
8383
->getMock();
8484
8585
// Discard (ignore) first logging statement
86-
$logger->expects($this->exactly(2))
86+
$logger->expects($this->exactly(1))
8787
->method('debug');
8888
8989
$logger->expects($this->exactly(2))

0 commit comments

Comments
 (0)