rixty
/
AzuraCast
mirror of https://github.com/AzuraCast/AzuraCast.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Remove packaged/helpers as it was only used in 2 places.

This commit is contained in:
Buster "Silver Eagle" Neece 2018-09-29 06:37:14 -05:00
parent ec9533db4f
commit fef1c487bb
6 changed files with 26 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -19,6 +19,7 @@ tmp/cache/*---*
/util/fixtures/**/*
!/util/fixtures/.gitkeep
web/static/yarn-error\.log
/util/package_usage_report*
# Composer-generated content
/vendor/

1
composer.json
View File

@ -32,7 +32,6 @@
"maxmind-db/reader": "~1.0",
"mobiledetect/mobiledetectlib": "^2.8",
"monolog/monolog": "^1.23",
"packaged/helpers": "^1.5",
"paragonie/certainty": "^2",
"php-http/socket-client": "^1.2",
"php-http/message": "^1.4",

70
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "efc1be26d0606fb1c60c0bbdf7676e28",
"content-hash": "55968856be089da1642b8b45352b987c",
"packages": [
{
"name": "azuracast/azuraforms",
@ -1705,12 +1705,12 @@
"source": {
"type": "git",
"url": "https://github.com/JamesHeinrich/getID3.git",
"reference": "17461949907103a68d0390103c50962618d318a4"
"reference": "dd1099bcef91ee9d750bba4eb3a0c93a73edebb8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/JamesHeinrich/getID3/zipball/17461949907103a68d0390103c50962618d318a4",
"reference": "17461949907103a68d0390103c50962618d318a4",
"url": "https://api.github.com/repos/JamesHeinrich/getID3/zipball/dd1099bcef91ee9d750bba4eb3a0c93a73edebb8",
"reference": "dd1099bcef91ee9d750bba4eb3a0c93a73edebb8",
"shasum": ""
},
"require": {
@ -1760,7 +1760,7 @@
"php",
"tags"
],
"time": "2018-09-22T16:42:14+00:00"
"time": "2018-09-28T23:48:50+00:00"
},
{
"name": "league/plates",
@ -2174,16 +2174,16 @@
},
{
"name": "ocramius/proxy-manager",
"version": "2.2.1",
"version": "2.2.2",
"source": {
"type": "git",
"url": "https://github.com/Ocramius/ProxyManager.git",
"reference": "306da837ddf12aa5a85a8ca343587ec822802ac3"
"reference": "14b137b06b0f911944132df9d51e445a35920ab1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/306da837ddf12aa5a85a8ca343587ec822802ac3",
"reference": "306da837ddf12aa5a85a8ca343587ec822802ac3",
"url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/14b137b06b0f911944132df9d51e445a35920ab1",
"reference": "14b137b06b0f911944132df9d51e445a35920ab1",
"shasum": ""
},
"require": {
@ -2240,47 +2240,7 @@
"proxy pattern",
"service proxies"
],
"time": "2018-08-26T15:07:25+00:00"
},
{
"name": "packaged/helpers",
"version": "1.15.1",
"source": {
"type": "git",
"url": "https://github.com/packaged/helpers.git",
"reference": "d90f23d2d6a9520b87331c03facc2dcb34bc15b5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/packaged/helpers/zipball/d90f23d2d6a9520b87331c03facc2dcb34bc15b5",
"reference": "d90f23d2d6a9520b87331c03facc2dcb34bc15b5",
"shasum": ""
},
"require": {
"php": ">=5.4.0"
},
"require-dev": {
"phpunit/phpunit": "~4.6"
},
"type": "library",
"autoload": {
"psr-4": {
"Packaged\\Helpers\\": "src",
"Packaged\\Tests\\": "tests"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Brooke Bryan",
"email": "brooke@bajb.net"
}
],
"description": "Generic PHP Helper Classes",
"time": "2018-09-04T09:50:54+00:00"
"time": "2018-09-27T13:45:01+00:00"
},
{
"name": "paragonie/certainty",
@ -3922,16 +3882,16 @@
},
{
"name": "codeception/phpunit-wrapper",
"version": "7.3.0",
"version": "7.3.1",
"source": {
"type": "git",
"url": "https://github.com/Codeception/phpunit-wrapper.git",
"reference": "a4990126a20bbaa67ca34088ff91960c209a664b"
"reference": "1967be130082effb3c30510cf8f8397fbd9d8b84"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/a4990126a20bbaa67ca34088ff91960c209a664b",
"reference": "a4990126a20bbaa67ca34088ff91960c209a664b",
"url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/1967be130082effb3c30510cf8f8397fbd9d8b84",
"reference": "1967be130082effb3c30510cf8f8397fbd9d8b84",
"shasum": ""
},
"require": {
@ -3961,7 +3921,7 @@
}
],
"description": "PHPUnit classes used by Codeception",
"time": "2018-08-28T23:24:24+00:00"
"time": "2018-09-28T15:36:26+00:00"
},
{
"name": "codeception/stub",

5
src/Assets.php
View File

@ -372,7 +372,10 @@ class Assets
protected function _sort()
{
if (!$this->is_sorted) {
$this->loaded = \Packaged\Helpers\Arrays::isort($this->loaded, 'order');
uasort($this->loaded, function($a, $b) {
return $a['order'] <=> $b['order']; // SPACESHIP!
});
$this->is_sorted = true;
}
}

6
src/Entity/Repository/SongRepository.php
View File

@ -15,7 +15,11 @@ class SongRepository extends BaseRepository
$ids_raw = $this->_em->createQuery('SELECT s.id FROM ' . $this->_entityName . ' s')
->getArrayResult();
return \Packaged\Helpers\Arrays::ipull($ids_raw, 'id');
$ids = [];
foreach($ids_raw as $id_raw) {
$ids[] = $id_raw['id'];
}
return $ids;
}
/**

2
util/unused.php
View File

@ -66,7 +66,7 @@ return [
* it sensitive especially for big projects and when requireDev option enabled
**/
'reportPath' => null, //path in directory, where usage report will be stores;
'reportPath' => __DIR__, //path in directory, where usage report will be stores;
/**
* Optional custom formatter (by default report stored as json)