Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ClientHints.php
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ public static function factory(array $headers): ClientHints

break;
case 'brands':
if (!empty($fullVersionList)) {
if ([] !== $fullVersionList) {
break;
}

Expand All @@ -336,7 +336,7 @@ public static function factory(array $headers): ClientHints
break;
case 'http-sec-ch-ua':
case 'sec-ch-ua':
if (!empty($fullVersionList)) {
if ([] !== $fullVersionList) {
break;
}

Expand Down
7 changes: 4 additions & 3 deletions DeviceDetector.php
Original file line number Diff line number Diff line change
Expand Up @@ -936,7 +936,7 @@ protected function parseDevice(): void
/**
* if it's fake UA then it's best not to identify it as Apple running Android OS or GNU/Linux
*/
if ('Apple' === $this->brand && !\in_array($osName, $appleOsNames)) {
if ('Apple' === $this->brand && !\in_array($osName, $appleOsNames, true)) {
$this->device = null;
$this->brand = '';
$this->model = '';
Expand All @@ -945,7 +945,7 @@ protected function parseDevice(): void
/**
* Assume all devices running iOS / Mac OS are from Apple
*/
if ('' === $this->brand && \in_array($osName, $appleOsNames)) {
if ('' === $this->brand && \in_array($osName, $appleOsNames, true)) {
$this->brand = 'Apple';
}

Expand Down Expand Up @@ -1137,7 +1137,7 @@ protected function parseDevice(): void
'Kylo', 'Espial TV Browser', 'LUJO TV Browser', 'LogicUI TV Browser', 'Open TV Browser', 'Seraphic Sraf',
'Opera Devices', 'Crow Browser', 'Vewd Browser', 'TiviMate', 'Quick Search TV', 'QJY TV Browser', 'TV Bro',
'Redline', 'Odin',
])
], true)
) {
$this->device = AbstractDeviceParser::DEVICE_TYPE_TV;
}
Expand Down Expand Up @@ -1177,6 +1177,7 @@ protected function parseOs(): void
$osParser->setClientHints($this->getClientHints());
$osParser->setYamlParser($this->getYamlParser());
$osParser->setCache($this->getCache());

$this->os = $osParser->parse();
}

Expand Down
2 changes: 1 addition & 1 deletion Parser/OperatingSystem.php
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ public static function getShortOsData(string $name): array
break;
}

return \compact('short', 'name');
return ['short' => $short, 'name' => $name];
}

/**
Expand Down
7 changes: 3 additions & 4 deletions Tests/DeviceDetectorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ public function testCacheSetAndGet(): void
$memcached = new \Memcached();
$doctrineCache = new MemcachedCache();
$doctrineCache->setMemcached($memcached);

$dd->setCache(new DoctrineBridge($doctrineCache));
$this->assertInstanceOf(DoctrineBridge::class, $dd->getCache());
}
Expand Down Expand Up @@ -609,7 +610,7 @@ public static function getBotFixtures(): array
$fixturesPath = \realpath(__DIR__ . '/fixtures/bots.yml');
$fixtures = \Spyc::YAMLLoad($fixturesPath);

return \array_map(static function ($elem) {
return \array_map(static function ($elem): array {
return [$elem];
}, $fixtures);
}
Expand Down Expand Up @@ -708,11 +709,9 @@ public static function getTypeMethodFixtures(): array
{
$fixtureData = \Spyc::YAMLLoad(\realpath(__DIR__ . '/Parser/fixtures/type-methods.yml'));

$fixtureData = \array_map(static function (array $item): array {
return \array_map(static function (array $item): array {
return ['ua' => $item['user_agent'], 'checkTypes' => $item['check']];
}, $fixtureData);

return $fixtureData;
}

/**
Expand Down
6 changes: 2 additions & 4 deletions Tests/Parser/Client/BrowserTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,9 @@ public static function getFixtures(): array
{
$fixtureData = Spyc::YAMLLoad(\realpath(__DIR__) . '/fixtures/browser.yml');

$fixtureData = \array_map(static function (array $item): array {
return \array_map(static function (array $item): array {
return ['useragent' => $item['user_agent'], 'client' => $item['client'], 'headers' => $item['headers'] ?? null];
}, $fixtureData);

return $fixtureData;
}

public function testGetAvailableBrowserFamilies(): void
Expand Down Expand Up @@ -156,7 +154,7 @@ public static function getFixturesBrowserHints(): array
$fixtures = [];

foreach ($hints as $name) {
$fixtures[] = \compact('name');
$fixtures[] = ['name' => $name];
}

return $fixtures;
Expand Down
4 changes: 1 addition & 3 deletions Tests/Parser/Client/FeedReaderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,9 @@ public static function getFixtures(): array
{
$fixtureData = Spyc::YAMLLoad(\realpath(__DIR__) . '/fixtures/feed_reader.yml');

$fixtureData = \array_map(static function (array $item): array {
return \array_map(static function (array $item): array {
return ['useragent' => $item['user_agent'], 'client' => $item['client']];
}, $fixtureData);

return $fixtureData;
}

public function testStructureFeedReaderYml(): void
Expand Down
4 changes: 1 addition & 3 deletions Tests/Parser/Client/LibraryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,9 @@ public static function getFixtures(): array
{
$fixtureData = Spyc::YAMLLoad(\realpath(__DIR__) . '/fixtures/library.yml');

$fixtureData = \array_map(static function (array $item): array {
return \array_map(static function (array $item): array {
return ['useragent' => $item['user_agent'], 'client' => $item['client']];
}, $fixtureData);

return $fixtureData;
}

public function testStructureLibraryYml(): void
Expand Down
4 changes: 1 addition & 3 deletions Tests/Parser/Client/MediaPlayerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,9 @@ public static function getFixtures(): array
{
$fixtureData = Spyc::YAMLLoad(\realpath(__DIR__) . '/fixtures/mediaplayer.yml');

$fixtureData = \array_map(static function (array $item): array {
return \array_map(static function (array $item): array {
return ['useragent' => $item['user_agent'], 'client' => $item['client']];
}, $fixtureData);

return $fixtureData;
}

public function testStructureMediaPlayerYml(): void
Expand Down
4 changes: 1 addition & 3 deletions Tests/Parser/Client/MobileAppTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,9 @@ public static function getFixtures(): array
{
$fixtureData = Spyc::YAMLLoad(\realpath(__DIR__) . '/fixtures/mobile_app.yml');

$fixtureData = \array_map(static function (array $item): array {
return \array_map(static function (array $item): array {
return ['useragent' => $item['user_agent'], 'client' => $item['client']];
}, $fixtureData);

return $fixtureData;
}

public function testStructureMobileAppYml(): void
Expand Down
4 changes: 1 addition & 3 deletions Tests/Parser/Client/PIMTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,9 @@ public static function getFixtures(): array
{
$fixtureData = Spyc::YAMLLoad(\realpath(__DIR__) . '/fixtures/pim.yml');

$fixtureData = \array_map(static function (array $item): array {
return \array_map(static function (array $item): array {
return ['useragent' => $item['user_agent'], 'client' => $item['client']];
}, $fixtureData);

return $fixtureData;
}

public function testStructurePimYml(): void
Expand Down
4 changes: 1 addition & 3 deletions Tests/Parser/Device/CameraTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,8 @@ public static function getFixtures(): array
{
$fixtureData = Spyc::YAMLLoad(\realpath(__DIR__) . '/fixtures/camera.yml');

$fixtureData = \array_map(static function (array $item): array {
return \array_map(static function (array $item): array {
return ['useragent' => $item['user_agent'], 'device' => $item['device']];
}, $fixtureData);

return $fixtureData;
}
}
4 changes: 1 addition & 3 deletions Tests/Parser/Device/CarBrowserTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,8 @@ public static function getFixtures(): array
{
$fixtureData = Spyc::YAMLLoad(\realpath(__DIR__) . '/fixtures/car_browser.yml');

$fixtureData = \array_map(static function (array $item): array {
return \array_map(static function (array $item): array {
return ['useragent' => $item['user_agent'], 'device' => $item['device']];
}, $fixtureData);

return $fixtureData;
}
}
4 changes: 1 addition & 3 deletions Tests/Parser/Device/ConsoleTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,8 @@ public static function getFixtures(): array
{
$fixtureData = Spyc::YAMLLoad(\realpath(__DIR__) . '/fixtures/console.yml');

$fixtureData = \array_map(static function (array $item): array {
return \array_map(static function (array $item): array {
return ['useragent' => $item['user_agent'], 'device' => $item['device']];
}, $fixtureData);

return $fixtureData;
}
}
4 changes: 1 addition & 3 deletions Tests/Parser/Device/NotebookTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,8 @@ public static function getFixtures(): array
{
$fixtureData = Spyc::YAMLLoad(\realpath(__DIR__) . '/fixtures/notebook.yml');

$fixtureData = \array_map(static function (array $item): array {
return \array_map(static function (array $item): array {
return ['useragent' => $item['user_agent'], 'device' => $item['device']];
}, $fixtureData);

return $fixtureData;
}
}
8 changes: 3 additions & 5 deletions Tests/Parser/OperatingSystemTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,9 @@ public static function getFixtures(): array
{
$fixtureData = Spyc::YAMLLoad(\realpath(__DIR__) . '/fixtures/oss.yml');

$fixtureData = \array_map(static function (array $item): array {
return \array_map(static function (array $item): array {
return ['useragent' => $item['user_agent'], 'os' => $item['os'], 'headers' => $item['headers'] ?? null];
}, $fixtureData);

return $fixtureData;
}

/**
Expand All @@ -65,7 +63,7 @@ public static function getAllOs(): array
{
$allOs = \array_keys(OperatingSystem::getAvailableOperatingSystems());

return \array_map(static function ($os) {
return \array_map(static function ($os): array {
return [$os];
}, $allOs);
}
Expand All @@ -84,7 +82,7 @@ public static function getAllFamilyOs(): array
{
$allFamilyOs = \call_user_func_array('array_merge', \array_values(OperatingSystem::getAvailableOperatingSystemFamilies()));

return \array_map(static function ($os) {
return \array_map(static function ($os): array {
return [$os];
}, $allFamilyOs);
}
Expand Down
16 changes: 8 additions & 8 deletions misc/generateBrandIdFree.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@
exit(0);
}

$mapIds = [];
// create map (max 1296)
$c = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
$chars = array_merge(
range('0', '9'),
range('A', 'Z')
);

for ($n = 65; $n < 123; $n++) {
$n < 91 || $n > 96 and $c[] = chr($n);
}
$mapIds = [];

for ($y = 0; $y < 36; $y++) {
for ($x = 0; $x < 36; $x++) {
$mapIds[] = sprintf('%s%s', $c[$x], $c[$y]);
foreach ($chars as $first) {
foreach ($chars as $second) {
$mapIds[] = $first . $second;
}
}

Expand Down
2 changes: 1 addition & 1 deletion misc/statistics.php
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ function format($str, $length): string
foreach ($deviceTypes as $deviceTypeId => $deviceCount) {
$reportStat[] = sprintf(
$mask,
sprintf('%s', mb_convert_case($deviceAvailableDeviceTypes[$deviceTypeId], MB_CASE_TITLE)),
mb_convert_case($deviceAvailableDeviceTypes[$deviceTypeId], MB_CASE_TITLE),
format($deviceCount, $parsedUAs),
sprintf('(%s%%)', trim(getPercentage($deviceCount, $parsedUAs)))
);
Expand Down
Loading