cubistore
/
web
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

run php-cs-fixer
continuous-integration/drone/push Build is failing Details

Browse Source
master
eater 5 years ago
parent 22e1737289
commit ee103ff4cc
Signed by: eater
GPG Key ID: AD2560A0F84F0759
17 changed files with 681 additions and 48 deletions
Show Stats Download Patch File Download Diff File

4
.drone.yml
Unescape Escape View File

@ -3,8 +3,8 @@ kind: pipeline
type: docker type: docker
steps: steps:
- name: phpstan - name: code checks
image: d.xr.to/php image: php:7.3
commands: commands:
- composer install - composer install
- ./vendor/bin/php-cs-fixer fix --dry-run . - ./vendor/bin/php-cs-fixer fix --dry-run .

1
.gitignore vendored
Unescape Escape View File

@ -2,3 +2,4 @@
/var /var
/certs /certs
/.idea/ /.idea/
.php_cs.cache

4
composer.json
Unescape Escape View File

@ -17,8 +17,8 @@
"ext-openssl": "*" "ext-openssl": "*"
}, },
"require-dev": { "require-dev": {
"squizlabs/php_codesniffer": "3.*", "phpstan/phpstan": "^0.11.19",
"phpstan/phpstan": "^0.11.19" "friendsofphp/php-cs-fixer": "^2.16"
}, },
"license": "GPLv3", "license": "GPLv3",
"authors": [ "authors": [

649
composer.lock generated
Unescape Escape View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "a17b5a4c80322e7802c1bfd1c5c5ce4e", "content-hash": "bd671ed8e9c1d02b3722d754c484d19f",
"packages": [ "packages": [
{ {
"name": "doctrine/annotations", "name": "doctrine/annotations",
@ -2592,6 +2592,68 @@
} }
], ],
"packages-dev": [ "packages-dev": [
{
"name": "composer/semver",
"version": "1.5.0",
"source": {
"type": "git",
"url": "https://github.com/composer/semver.git",
"reference": "46d9139568ccb8d9e7cdd4539cab7347568a5e2e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/semver/zipball/46d9139568ccb8d9e7cdd4539cab7347568a5e2e",
"reference": "46d9139568ccb8d9e7cdd4539cab7347568a5e2e",
"shasum": ""
},
"require": {
"php": "^5.3.2 || ^7.0"
},
"require-dev": {
"phpunit/phpunit": "^4.5 || ^5.0.5",
"phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
}
},
"autoload": {
"psr-4": {
"Composer\\Semver\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nils Adermann",
"email": "naderman@naderman.de",
"homepage": "http://www.naderman.de"
},
{
"name": "Jordi Boggiano",
"email": "j.boggiano@seld.be",
"homepage": "http://seld.be"
},
{
"name": "Rob Bast",
"email": "rob.bast@gmail.com",
"homepage": "http://robbast.nl"
}
],
"description": "Semver library that offers utilities, version constraint parsing and validation.",
"keywords": [
"semantic",
"semver",
"validation",
"versioning"
],
"time": "2019-03-19T17:25:45+00:00"
},
{ {
"name": "composer/xdebug-handler", "name": "composer/xdebug-handler",
"version": "1.4.0", "version": "1.4.0",
@ -2636,6 +2698,95 @@
], ],
"time": "2019-11-06T16:40:04+00:00" "time": "2019-11-06T16:40:04+00:00"
}, },
{
"name": "friendsofphp/php-cs-fixer",
"version": "v2.16.0",
"source": {
"type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
"reference": "ceaff36bee1ed3f1bbbedca36d2528c0826c336d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/ceaff36bee1ed3f1bbbedca36d2528c0826c336d",
"reference": "ceaff36bee1ed3f1bbbedca36d2528c0826c336d",
"shasum": ""
},
"require": {
"composer/semver": "^1.4",
"composer/xdebug-handler": "^1.2",
"doctrine/annotations": "^1.2",
"ext-json": "*",
"ext-tokenizer": "*",
"php": "^5.6 || ^7.0",
"php-cs-fixer/diff": "^1.3",
"symfony/console": "^3.4.17 || ^4.1.6",
"symfony/event-dispatcher": "^3.0 || ^4.0",
"symfony/filesystem": "^3.0 || ^4.0",
"symfony/finder": "^3.0 || ^4.0",
"symfony/options-resolver": "^3.0 || ^4.0",
"symfony/polyfill-php70": "^1.0",
"symfony/polyfill-php72": "^1.4",
"symfony/process": "^3.0 || ^4.0",
"symfony/stopwatch": "^3.0 || ^4.0"
},
"require-dev": {
"johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0",
"justinrainbow/json-schema": "^5.0",
"keradus/cli-executor": "^1.2",
"mikey179/vfsstream": "^1.6",
"php-coveralls/php-coveralls": "^2.1",
"php-cs-fixer/accessible-object": "^1.0",
"php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.1",
"php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.1",
"phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.1",
"phpunitgoodpractices/traits": "^1.8",
"symfony/phpunit-bridge": "^4.3",
"symfony/yaml": "^3.0 || ^4.0"
},
"suggest": {
"ext-mbstring": "For handling non-UTF8 characters in cache signature.",
"php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.",
"php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.",
"symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible."
},
"bin": [
"php-cs-fixer"
],
"type": "application",
"autoload": {
"psr-4": {
"PhpCsFixer\\": "src/"
},
"classmap": [
"tests/Test/AbstractFixerTestCase.php",
"tests/Test/AbstractIntegrationCaseFactory.php",
"tests/Test/AbstractIntegrationTestCase.php",
"tests/Test/Assert/AssertTokensTrait.php",
"tests/Test/IntegrationCase.php",
"tests/Test/IntegrationCaseFactory.php",
"tests/Test/IntegrationCaseFactoryInterface.php",
"tests/Test/InternalIntegrationCaseFactory.php",
"tests/TestCase.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Dariusz Rumiński",
"email": "dariusz.ruminski@gmail.com"
}
],
"description": "A tool to automatically fix PHP code style",
"time": "2019-11-03T13:31:09+00:00"
},
{ {
"name": "jean85/pretty-package-versions", "name": "jean85/pretty-package-versions",
"version": "1.2", "version": "1.2",
@ -3214,6 +3365,102 @@
], ],
"time": "2019-10-21T20:40:16+00:00" "time": "2019-10-21T20:40:16+00:00"
}, },
{
"name": "paragonie/random_compat",
"version": "v9.99.99",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
"reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
"reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
"shasum": ""
},
"require": {
"php": "^7"
},
"require-dev": {
"phpunit/phpunit": "4.*|5.*",
"vimeo/psalm": "^1"
},
"suggest": {
"ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
},
"type": "library",
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Paragon Initiative Enterprises",
"email": "security@paragonie.com",
"homepage": "https://paragonie.com"
}
],
"description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
"keywords": [
"csprng",
"polyfill",
"pseudorandom",
"random"
],
"time": "2018-07-02T15:55:56+00:00"
},
{
"name": "php-cs-fixer/diff",
"version": "v1.3.0",
"source": {
"type": "git",
"url": "https://github.com/PHP-CS-Fixer/diff.git",
"reference": "78bb099e9c16361126c86ce82ec4405ebab8e756"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/78bb099e9c16361126c86ce82ec4405ebab8e756",
"reference": "78bb099e9c16361126c86ce82ec4405ebab8e756",
"shasum": ""
},
"require": {
"php": "^5.6 || ^7.0"
},
"require-dev": {
"phpunit/phpunit": "^5.7.23 || ^6.4.3",
"symfony/process": "^3.3"
},
"type": "library",
"autoload": {
"classmap": [
"src/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"authors": [
{
"name": "Kore Nordmann",
"email": "mail@kore-nordmann.de"
},
{
"name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de"
},
{
"name": "SpacePossum"
}
],
"description": "sebastian/diff v2 backport support for PHP5.6",
"homepage": "https://github.com/PHP-CS-Fixer",
"keywords": [
"diff"
],
"time": "2018-02-15T16:58:55+00:00"
},
{ {
"name": "phpstan/phpdoc-parser", "name": "phpstan/phpdoc-parser",
"version": "0.3.5", "version": "0.3.5",
@ -3434,6 +3681,184 @@
], ],
"time": "2019-10-28T04:36:32+00:00" "time": "2019-10-28T04:36:32+00:00"
}, },
{
"name": "symfony/event-dispatcher",
"version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "0df002fd4f500392eabd243c2947061a50937287"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/0df002fd4f500392eabd243c2947061a50937287",
"reference": "0df002fd4f500392eabd243c2947061a50937287",
"shasum": ""
},
"require": {
"php": "^7.1.3",
"symfony/event-dispatcher-contracts": "^1.1"
},
"conflict": {
"symfony/dependency-injection": "<3.4"
},
"provide": {
"psr/event-dispatcher-implementation": "1.0",
"symfony/event-dispatcher-implementation": "1.1"
},
"require-dev": {
"psr/log": "~1.0",
"symfony/config": "~3.4|~4.0",
"symfony/dependency-injection": "~3.4|~4.0",
"symfony/expression-language": "~3.4|~4.0",
"symfony/http-foundation": "^3.4|^4.0",
"symfony/service-contracts": "^1.1",
"symfony/stopwatch": "~3.4|~4.0"
},
"suggest": {
"symfony/dependency-injection": "",
"symfony/http-kernel": ""
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.3-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Component\\EventDispatcher\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
"time": "2019-11-03T09:04:05+00:00"
},
{
"name": "symfony/event-dispatcher-contracts",
"version": "v1.1.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher-contracts.git",
"reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c43ab685673fb6c8d84220c77897b1d6cdbe1d18",
"reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18",
"shasum": ""
},
"require": {
"php": "^7.1.3"
},
"suggest": {
"psr/event-dispatcher": "",
"symfony/event-dispatcher-implementation": ""
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.1-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Contracts\\EventDispatcher\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Generic abstractions related to dispatching event",
"homepage": "https://symfony.com",
"keywords": [
"abstractions",
"contracts",
"decoupling",
"interfaces",
"interoperability",
"standards"
],
"time": "2019-09-17T09:54:03+00:00"
},
{
"name": "symfony/filesystem",
"version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
"reference": "9abbb7ef96a51f4d7e69627bc6f63307994e4263"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/9abbb7ef96a51f4d7e69627bc6f63307994e4263",
"reference": "9abbb7ef96a51f4d7e69627bc6f63307994e4263",
"shasum": ""
},
"require": {
"php": "^7.1.3",
"symfony/polyfill-ctype": "~1.8"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.3-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Component\\Filesystem\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
"time": "2019-08-20T14:07:54+00:00"
},
{ {
"name": "symfony/finder", "name": "symfony/finder",
"version": "v4.3.8", "version": "v4.3.8",
@ -3482,6 +3907,223 @@
"description": "Symfony Finder Component", "description": "Symfony Finder Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2019-10-30T12:53:54+00:00" "time": "2019-10-30T12:53:54+00:00"
},
{
"name": "symfony/options-resolver",
"version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
"reference": "f46c7fc8e207bd8a2188f54f8738f232533765a4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/f46c7fc8e207bd8a2188f54f8738f232533765a4",
"reference": "f46c7fc8e207bd8a2188f54f8738f232533765a4",
"shasum": ""
},
"require": {
"php": "^7.1.3"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.3-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Component\\OptionsResolver\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony OptionsResolver Component",
"homepage": "https://symfony.com",
"keywords": [
"config",
"configuration",
"options"
],
"time": "2019-10-28T20:59:01+00:00"
},
{
"name": "symfony/polyfill-php70",
"version": "v1.12.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php70.git",
"reference": "54b4c428a0054e254223797d2713c31e08610831"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/54b4c428a0054e254223797d2713c31e08610831",
"reference": "54b4c428a0054e254223797d2713c31e08610831",
"shasum": ""
},
"require": {
"paragonie/random_compat": "~1.0|~2.0|~9.99",
"php": ">=5.3.3"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.12-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Polyfill\\Php70\\": ""
},
"files": [
"bootstrap.php"
],
"classmap": [
"Resources/stubs"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
"polyfill",
"portable",
"shim"
],
"time": "2019-08-06T08:03:45+00:00"
},
{
"name": "symfony/polyfill-php72",
"version": "v1.12.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
"reference": "04ce3335667451138df4307d6a9b61565560199e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/04ce3335667451138df4307d6a9b61565560199e",
"reference": "04ce3335667451138df4307d6a9b61565560199e",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.12-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Polyfill\\Php72\\": ""
},
"files": [
"bootstrap.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
"polyfill",
"portable",
"shim"
],
"time": "2019-08-06T08:03:45+00:00"
},
{
"name": "symfony/process",
"version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "3b2e0cb029afbb0395034509291f21191d1a4db0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/3b2e0cb029afbb0395034509291f21191d1a4db0",
"reference": "3b2e0cb029afbb0395034509291f21191d1a4db0",
"shasum": ""
},
"require": {
"php": "^7.1.3"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.3-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Component\\Process\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
"time": "2019-10-28T17:07:32+00:00"
} }
], ],
"aliases": [], "aliases": [],
@ -3491,7 +4133,10 @@
"prefer-lowest": false, "prefer-lowest": false,
"platform": { "platform": {
"php": "^7.3", "php": "^7.3",
"ext-json": "*" "ext-json": "*",
"ext-zip": "*",
"ext-simplexml": "*",
"ext-openssl": "*"
}, },
"platform-dev": [] "platform-dev": []
} }

7
src/Controller/AppManager.php
Unescape Escape View File

@ -3,7 +3,6 @@
namespace CubiStore\Web\Controller; namespace CubiStore\Web\Controller;
use CubiStore\Web\Service\ApkService; use CubiStore\Web\Service\ApkService;
use CubiStore\Web\Service\AppService; use CubiStore\Web\Service\AppService;
use CubiStore\Web\Utils\Apk; use CubiStore\Web\Utils\Apk;
@ -16,13 +15,13 @@ use Twig\Environment;
class AppManager class AppManager
{ {
function createShow(Environment $twig, ResponseInterface $response) public function createShow(Environment $twig, ResponseInterface $response)
{ {
$response->getBody()->write($twig->render('app/create.html.twig')); $response->getBody()->write($twig->render('app/create.html.twig'));
return $response; return $response;
} }
function createAction(Request $request, Response $response, ApkService $apkService, AppService $appService, EntityManager $em) public function createAction(Request $request, Response $response, ApkService $apkService, AppService $appService, EntityManager $em)
{ {
$files = $request->getUploadedFiles(); $files = $request->getUploadedFiles();
@ -87,4 +86,4 @@ class AppManager
->withStatus(302) ->withStatus(302)
->withHeader('Location', '/app/' . $app->getName() . '/' . $app->getId() . '/manage'); ->withHeader('Location', '/app/' . $app->getName() . '/' . $app->getId() . '/manage');
} }
} }

3
src/Controller/Home.php
Unescape Escape View File

@ -3,7 +3,6 @@
namespace CubiStore\Web\Controller; namespace CubiStore\Web\Controller;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
class Home class Home
@ -13,4 +12,4 @@ class Home
$response->getBody()->write("Hello world"); $response->getBody()->write("Hello world");
return $response; return $response;
} }
} }

7
src/Controller/Repo.php
Unescape Escape View File

@ -3,13 +3,12 @@
namespace CubiStore\Web\Controller; namespace CubiStore\Web\Controller;
use CubiStore\Web\Service\FDroidRepoService; use CubiStore\Web\Service\FDroidRepoService;
use Slim\Psr7\Response; use Slim\Psr7\Response;
class Repo class Repo
{ {
function json(Response $response, FDroidRepoService $repoService) public function json(Response $response, FDroidRepoService $repoService)
{ {
$jsonArr = $repoService->createIndexV1Array(); $jsonArr = $repoService->createIndexV1Array();
@ -20,7 +19,7 @@ class Repo
->withHeader('Content-Type', 'application/json'); ->withHeader('Content-Type', 'application/json');
} }
function jarJson(Response $response, FDroidRepoService $repoService) public function jarJson(Response $response, FDroidRepoService $repoService)
{ {
$jsonArr = $repoService->createIndexV1Array(); $jsonArr = $repoService->createIndexV1Array();
$jsonFile = json_encode($jsonArr); $jsonFile = json_encode($jsonArr);
@ -32,4 +31,4 @@ class Repo
->withHeader('Content-Type', 'application/x-jar') ->withHeader('Content-Type', 'application/x-jar')
->withHeader('ETag', (string)time()); ->withHeader('ETag', (string)time());
} }
} }

16
src/Main.php
Unescape Escape View File

@ -34,12 +34,12 @@ class Main
$this->env = $env; $this->env = $env;
} }
static function main(string $env = 'prod') public static function main(string $env = 'prod')
{ {
static::make($env)->run(); static::make($env)->run();
} }
static function make(string $env = 'prod') public static function make(string $env = 'prod')
{ {
$_ENV['ENV'] = $env; $_ENV['ENV'] = $env;
$main = new Main($env); $main = new Main($env);
@ -47,19 +47,19 @@ class Main
return $main; return $main;
} }
function run() public function run()
{ {
$this->app->run(); $this->app->run();
} }
function setup() public function setup()
{ {
$routes = $this->setupRoutes(); $routes = $this->setupRoutes();
$this->setupContainer($routes); $this->setupContainer($routes);
$this->setupSlim($routes); $this->setupSlim($routes);
} }
function setupRoutes(): ICompiledRoutes public function setupRoutes(): ICompiledRoutes
{ {
$compiledRoutesFile = __DIR__ . '/../var/cache/routes.php'; $compiledRoutesFile = __DIR__ . '/../var/cache/routes.php';
@ -74,7 +74,7 @@ class Main
return new CompiledRoutes(); return new CompiledRoutes();
} }
function setupContainer(ICompiledRoutes $routes) public function setupContainer(ICompiledRoutes $routes)
{ {
$containerBuilder = new ContainerBuilder(); $containerBuilder = new ContainerBuilder();
@ -98,7 +98,7 @@ class Main
$this->container = $containerBuilder->build(); $this->container = $containerBuilder->build();
} }
function setupSlim(ICompiledRoutes $compiledRoutes) public function setupSlim(ICompiledRoutes $compiledRoutes)
{ {
$app = Bridge::create($this->container); $app = Bridge::create($this->container);
$compiledRoutes->configure($app); $compiledRoutes->configure($app);
@ -111,4 +111,4 @@ class Main
{ {
return $this->container->get($class); return $this->container->get($class);
} }
} }

3
src/Model/App.php
Unescape Escape View File

@ -3,7 +3,6 @@
namespace CubiStore\Web\Model; namespace CubiStore\Web\Model;
use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
@ -125,4 +124,4 @@ class App
{ {
$this->status = $status; $this->status = $status;
} }
} }

3
src/Model/Release.php
Unescape Escape View File

@ -3,7 +3,6 @@
namespace CubiStore\Web\Model; namespace CubiStore\Web\Model;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
/** /**
@ -115,4 +114,4 @@ class Release
{ {
$this->apk = $apk; $this->apk = $apk;
} }
} }

4
src/Service/ApkService.php
Unescape Escape View File

@ -3,8 +3,6 @@
namespace CubiStore\Web\Service; namespace CubiStore\Web\Service;
class ApkService class ApkService
{ {
}
}

3
src/Service/AppService.php
Unescape Escape View File

@ -3,7 +3,6 @@
namespace CubiStore\Web\Service; namespace CubiStore\Web\Service;
use ApkParser\Manifest; use ApkParser\Manifest;
use ApkParser\Parser; use ApkParser\Parser;
use CubiStore\Web\Model\App; use CubiStore\Web\Model\App;
@ -61,4 +60,4 @@ class AppService
{ {
return __DIR__ . '/../../var/storage/apk/' . $app->getName() . '/' . $app->getId() . '/' . $apk->getVersionCode(); return __DIR__ . '/../../var/storage/apk/' . $app->getName() . '/' . $app->getId() . '/' . $apk->getVersionCode();
} }
} }

3
src/Service/FDroidRepoService.php
Unescape Escape View File

@ -3,7 +3,6 @@
namespace CubiStore\Web\Service; namespace CubiStore\Web\Service;
use CubiStore\Web\Model\App; use CubiStore\Web\Model\App;
use DI\Container; use DI\Container;
use Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityManager;
@ -161,4 +160,4 @@ class FDroidRepoService
return $zipContent; return $zipContent;
} }
} }

7
src/Utils/Apk.php
Unescape Escape View File

@ -3,7 +3,6 @@
namespace CubiStore\Web\Utils; namespace CubiStore\Web\Utils;
use SimpleXMLElement; use SimpleXMLElement;
class Apk class Apk
@ -26,7 +25,7 @@ class Apk
$this->file = $file; $this->file = $file;
} }
function isValid(): bool public function isValid(): bool
{ {
// Get first 4 bytes // Get first 4 bytes
$fh = fopen($this->file, 'r'); $fh = fopen($this->file, 'r');
@ -46,7 +45,7 @@ class Apk
return $valid; return $valid;
} }
function getManifest(): SimpleXMLElement public function getManifest(): SimpleXMLElement
{ {
if ($this->manifest === null) { if ($this->manifest === null) {
$xml = $this->cmd('androguard', 'axml', '-o', '/dev/stdout', $this->file); $xml = $this->cmd('androguard', 'axml', '-o', '/dev/stdout', $this->file);
@ -98,4 +97,4 @@ class Apk
pclose($proc); pclose($proc);
return $data; return $data;
} }
} }

3
src/Utils/ICompiledRoutes.php
Unescape Escape View File

@ -3,11 +3,10 @@
namespace CubiStore\Web\Utils; namespace CubiStore\Web\Utils;
use Slim\App; use Slim\App;
interface ICompiledRoutes interface ICompiledRoutes
{ {
public function configure(App $app); public function configure(App $app);
public function getKeys(): array; public function getKeys(): array;
} }

9
src/Utils/Route.php
Unescape Escape View File

@ -3,7 +3,6 @@
namespace CubiStore\Web\Utils; namespace CubiStore\Web\Utils;
class Route class Route
{ {
const TYPE_ROOT = 'root'; const TYPE_ROOT = 'root';
@ -60,7 +59,7 @@ class Route
return $route; return $route;
} }
static function group(Route $parent, string $path): Route public static function group(Route $parent, string $path): Route
{ {
$route = static::new($parent, $path, self::TYPE_GROUP); $route = static::new($parent, $path, self::TYPE_GROUP);
$route->children = []; $route->children = [];
@ -74,7 +73,7 @@ class Route
* @param string $call * @param string $call
* @return Route * @return Route
*/ */
static function call(Route $parent, string $method, string $path, string $call): Route public static function call(Route $parent, string $method, string $path, string $call): Route
{ {
$route = static::new($parent, $path, self::TYPE_CALL); $route = static::new($parent, $path, self::TYPE_CALL);
$route->method = $method; $route->method = $method;
@ -82,7 +81,7 @@ class Route
return $route; return $route;
} }
static function root(): Route public static function root(): Route
{ {
$route = new Route(); $route = new Route();
$route->type = self::TYPE_ROOT; $route->type = self::TYPE_ROOT;
@ -130,4 +129,4 @@ class Route
throw new \RuntimeException("invalid type for route"); throw new \RuntimeException("invalid type for route");
} }
} }

3
src/Utils/RouteCompiler.php
Unescape Escape View File

@ -3,7 +3,6 @@
namespace CubiStore\Web\Utils; namespace CubiStore\Web\Utils;
class RouteCompiler class RouteCompiler
{ {
private $target; private $target;
@ -82,4 +81,4 @@ class CompiledRoutes implements ICompiledRoutes {
return $head . $configure . $tail; return $head . $configure . $tail;
} }
} }

Write Preview
Loading…
Cancel
Save