author
int64 658
755k
| date
stringlengths 19
19
| timezone
int64 -46,800
43.2k
| hash
stringlengths 40
40
| message
stringlengths 5
490
| mods
list | language
stringclasses 20
values | license
stringclasses 3
values | repo
stringlengths 5
68
| original_message
stringlengths 12
491
|
|---|---|---|---|---|---|---|---|---|---|
95,168 |
16.11.2018 16:59:44
| -3,600 |
6adbd74568cca26225547b62ad4e1e8919b939a1
|
Set the locale from the submitted locales array
|
[
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/UserController.php",
"new_path": "src/Controller/Backend/UserController.php",
"diff": "@@ -51,7 +51,7 @@ class UserController extends BaseController\n$user = $this->getUser();\n$userTitle = $user->getFullName();\n$url = $urlGenerator->generate('bolt_profile_edit');\n- $locale = $request->get('user')['locale'];\n+ $locale = current($request->get('locale'));\n$newPassword = $request->get('password');\n$user->setFullName($request->get('fullName'));\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Set the locale from the submitted locales array
|
95,168 |
16.11.2018 17:05:41
| -3,600 |
3440d8aefd1c3a57205d0427eb888dc73dc6a890
|
Delete ChangePasswordType.php
|
[
{
"change_type": "DELETE",
"old_path": "src/Form/ChangePasswordType.php",
"new_path": null,
"diff": "-<?php\n-\n-declare(strict_types=1);\n-\n-namespace Bolt\\Form;\n-\n-use Symfony\\Component\\Form\\AbstractType;\n-use Symfony\\Component\\Form\\Extension\\Core\\Type\\PasswordType;\n-use Symfony\\Component\\Form\\Extension\\Core\\Type\\RepeatedType;\n-use Symfony\\Component\\Form\\FormBuilderInterface;\n-use Symfony\\Component\\Security\\Core\\Encoder\\BCryptPasswordEncoder;\n-use Symfony\\Component\\Security\\Core\\Validator\\Constraints\\UserPassword;\n-use Symfony\\Component\\Validator\\Constraints\\Length;\n-use Symfony\\Component\\Validator\\Constraints\\NotBlank;\n-\n-class ChangePasswordType extends AbstractType\n-{\n- /**\n- * {@inheritdoc}\n- */\n- public function buildForm(FormBuilderInterface $builder, array $options): void\n- {\n- $builder\n- ->add('currentPassword', PasswordType::class, [\n- 'constraints' => [\n- new UserPassword(),\n- ],\n- 'label' => 'label.current_password',\n- 'attr' => [\n- 'autocomplete' => 'off',\n- ],\n- ])\n- ->add('newPassword', RepeatedType::class, [\n- 'type' => PasswordType::class,\n- 'constraints' => [\n- new NotBlank(),\n- new Length([\n- 'min' => 5,\n- 'max' => BCryptPasswordEncoder::MAX_PASSWORD_LENGTH,\n- ]),\n- ],\n- 'first_options' => [\n- 'label' => 'label.new_password',\n- ],\n- 'second_options' => [\n- 'label' => 'label.new_password_confirm',\n- ],\n- ])\n- ;\n- }\n-}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Delete ChangePasswordType.php
|
95,144 |
16.11.2018 17:16:29
| -3,600 |
34efe3c4c82000d18536fe9eac6ce7d542791b80
|
Refactoring conrtollers and their constructor
|
[
{
"change_type": "MODIFY",
"old_path": "src/Controller/Async/News.php",
"new_path": "src/Controller/Async/News.php",
"diff": "@@ -104,10 +104,10 @@ final class News\n$client = new Client(['base_uri' => $source]);\n$fetchedNewsData = $client->request('GET', '/', $options)->getBody();\n} catch (RequestException $e) {\n- $this->app['logger.system']->error(\n- 'Error occurred during newsfeed fetch',\n- ['event' => 'exception', 'exception' => $e]\n- );\n+// $this->app['logger.system']->error(\n+// 'Error occurred during newsfeed fetch',\n+// ['event' => 'exception', 'exception' => $e]\n+// );\nreturn [\n'error' => [\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/EditMediaController.php",
"new_path": "src/Controller/Backend/EditMediaController.php",
"diff": "@@ -60,7 +60,6 @@ class EditMediaController extends BaseController\n*/\npublic function __construct(\nConfig $config,\n- TemplateChooser $templateChooser,\nCsrfTokenManagerInterface $csrfTokenManager,\nObjectManager $manager,\nUrlGeneratorInterface $urlGenerator,\n@@ -68,7 +67,7 @@ class EditMediaController extends BaseController\nAreas $areas,\nMediaFactory $mediaFactory\n) {\n- parent::__construct($config, $templateChooser, $csrfTokenManager);\n+ parent::__construct($config, $csrfTokenManager);\n$this->manager = $manager;\n$this->urlGenerator = $urlGenerator;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/EditRecordController.php",
"new_path": "src/Controller/Backend/EditRecordController.php",
"diff": "@@ -27,12 +27,6 @@ use Symfony\\Component\\Security\\Csrf\\CsrfTokenManagerInterface;\n*/\nclass EditRecordController extends BaseController\n{\n- public function __construct(Config $config, CsrfTokenManagerInterface $csrfTokenManager)\n- {\n- $this->config = $config;\n- $this->csrfTokenManager = $csrfTokenManager;\n- }\n-\n/**\n* @Route(\"/edit/{id}\", name=\"bolt_edit_record\", methods={\"GET\"})\n*\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/BaseController.php",
"new_path": "src/Controller/BaseController.php",
"diff": "@@ -23,10 +23,9 @@ class BaseController extends AbstractController\n/** @var CsrfTokenManagerInterface */\nprotected $csrfTokenManager;\n- public function __construct(Config $config, TemplateChooser $templateChooser, CsrfTokenManagerInterface $csrfTokenManager)\n+ public function __construct(Config $config, CsrfTokenManagerInterface $csrfTokenManager)\n{\n$this->config = $config;\n- $this->templateChooser = $templateChooser;\n$this->csrfTokenManager = $csrfTokenManager;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Frontend/DetailController.php",
"new_path": "src/Controller/Frontend/DetailController.php",
"diff": "@@ -4,14 +4,24 @@ declare(strict_types=1);\nnamespace Bolt\\Controller\\Frontend;\n+use Bolt\\Configuration\\Config;\nuse Bolt\\Controller\\BaseController;\nuse Bolt\\Repository\\ContentRepository;\nuse Bolt\\Repository\\FieldRepository;\n+use Bolt\\TemplateChooser;\nuse Symfony\\Component\\HttpFoundation\\Response;\nuse Symfony\\Component\\Routing\\Annotation\\Route;\n+use Symfony\\Component\\Security\\Csrf\\CsrfTokenManagerInterface;\nclass DetailController extends BaseController\n{\n+ public function __construct(Config $config, CsrfTokenManagerInterface $csrfTokenManager, TemplateChooser $templateChooser)\n+ {\n+ parent::__construct($config, $csrfTokenManager);\n+\n+ $this->templateChooser = $templateChooser;\n+ }\n+\n/**\n* @Route(\n* \"/{contenttypeslug}/{slug}\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Frontend/HomepageController.php",
"new_path": "src/Controller/Frontend/HomepageController.php",
"diff": "@@ -4,13 +4,23 @@ declare(strict_types=1);\nnamespace Bolt\\Controller\\Frontend;\n+use Bolt\\Configuration\\Config;\nuse Bolt\\Controller\\BaseController;\nuse Bolt\\Repository\\ContentRepository;\n+use Bolt\\TemplateChooser;\nuse Symfony\\Component\\HttpFoundation\\Response;\nuse Symfony\\Component\\Routing\\Annotation\\Route;\n+use Symfony\\Component\\Security\\Csrf\\CsrfTokenManagerInterface;\nclass HomepageController extends BaseController\n{\n+ public function __construct(Config $config, CsrfTokenManagerInterface $csrfTokenManager, TemplateChooser $templateChooser)\n+ {\n+ parent::__construct($config, $csrfTokenManager);\n+\n+ $this->templateChooser = $templateChooser;\n+ }\n+\n/**\n* @Route(\"/\", methods={\"GET\"}, name=\"homepage\")\n*\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Frontend/ListingController.php",
"new_path": "src/Controller/Frontend/ListingController.php",
"diff": "@@ -4,15 +4,25 @@ declare(strict_types=1);\nnamespace Bolt\\Controller\\Frontend;\n+use Bolt\\Configuration\\Config;\nuse Bolt\\Controller\\BaseController;\nuse Bolt\\Entity\\Content;\nuse Bolt\\Repository\\ContentRepository;\n+use Bolt\\TemplateChooser;\nuse Symfony\\Component\\HttpFoundation\\Request;\nuse Symfony\\Component\\HttpFoundation\\Response;\nuse Symfony\\Component\\Routing\\Annotation\\Route;\n+use Symfony\\Component\\Security\\Csrf\\CsrfTokenManagerInterface;\nclass ListingController extends BaseController\n{\n+ public function __construct(Config $config, CsrfTokenManagerInterface $csrfTokenManager, TemplateChooser $templateChooser)\n+ {\n+ parent::__construct($config, $csrfTokenManager);\n+\n+ $this->templateChooser = $templateChooser;\n+ }\n+\n/**\n* @Route(\n* \"/{contenttypeslug}\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Frontend/PreviewController.php",
"new_path": "src/Controller/Frontend/PreviewController.php",
"diff": "@@ -4,13 +4,23 @@ declare(strict_types=1);\nnamespace Bolt\\Controller\\Frontend;\n+use Bolt\\Configuration\\Config;\nuse Bolt\\Controller\\BaseController;\nuse Bolt\\Entity\\Content;\n+use Bolt\\TemplateChooser;\nuse Symfony\\Component\\HttpFoundation\\Response;\nuse Symfony\\Component\\Routing\\Annotation\\Route;\n+use Symfony\\Component\\Security\\Csrf\\CsrfTokenManagerInterface;\nclass PreviewController extends BaseController\n{\n+ public function __construct(Config $config, CsrfTokenManagerInterface $csrfTokenManager, TemplateChooser $templateChooser)\n+ {\n+ parent::__construct($config, $csrfTokenManager);\n+\n+ $this->templateChooser = $templateChooser;\n+ }\n+\n/**\n* @Route(\"/preview\", methods={\"GET\", \"POST\"}, name=\"preview\")\n*/\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Frontend/SearchController.php",
"new_path": "src/Controller/Frontend/SearchController.php",
"diff": "@@ -4,16 +4,26 @@ declare(strict_types=1);\nnamespace Bolt\\Controller\\Frontend;\n+use Bolt\\Configuration\\Config;\nuse Bolt\\Content\\ContentType;\nuse Bolt\\Controller\\BaseController;\nuse Bolt\\Entity\\Content;\nuse Bolt\\Repository\\ContentRepository;\n+use Bolt\\TemplateChooser;\nuse Symfony\\Component\\HttpFoundation\\Request;\nuse Symfony\\Component\\HttpFoundation\\Response;\nuse Symfony\\Component\\Routing\\Annotation\\Route;\n+use Symfony\\Component\\Security\\Csrf\\CsrfTokenManagerInterface;\nclass SearchController extends BaseController\n{\n+ public function __construct(Config $config, CsrfTokenManagerInterface $csrfTokenManager, TemplateChooser $templateChooser)\n+ {\n+ parent::__construct($config, $csrfTokenManager);\n+\n+ $this->templateChooser = $templateChooser;\n+ }\n+\n/**\n* @Route(\"/search\", methods={\"GET\", \"POST\"}, name=\"search\")\n*\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Frontend/TaxonomyController.php",
"new_path": "src/Controller/Frontend/TaxonomyController.php",
"diff": "@@ -4,17 +4,27 @@ declare(strict_types=1);\nnamespace Bolt\\Controller\\Frontend;\n+use Bolt\\Configuration\\Config;\nuse Bolt\\Content\\ContentType;\nuse Bolt\\Controller\\BaseController;\nuse Bolt\\Entity\\Content;\nuse Bolt\\Repository\\ContentRepository;\nuse Bolt\\Repository\\FieldRepository;\n+use Bolt\\TemplateChooser;\nuse Symfony\\Component\\HttpFoundation\\Request;\nuse Symfony\\Component\\HttpFoundation\\Response;\nuse Symfony\\Component\\Routing\\Annotation\\Route;\n+use Symfony\\Component\\Security\\Csrf\\CsrfTokenManagerInterface;\nclass TaxonomyController extends BaseController\n{\n+ public function __construct(Config $config, CsrfTokenManagerInterface $csrfTokenManager, TemplateChooser $templateChooser)\n+ {\n+ parent::__construct($config, $csrfTokenManager);\n+\n+ $this->templateChooser = $templateChooser;\n+ }\n+\n/**\n* @Route(\"\n* /{taxonomyslug}/{slug}\",\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Refactoring conrtollers and their constructor
|
95,144 |
16.11.2018 17:33:41
| -3,600 |
c81798be813ac16df138f7595e6c2139d2c1b0d5
|
Working on Controllers
|
[
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/EditRecordController.php",
"new_path": "src/Controller/Backend/EditRecordController.php",
"diff": "@@ -4,7 +4,6 @@ declare(strict_types=1);\nnamespace Bolt\\Controller\\Backend;\n-use Bolt\\Configuration\\Config;\nuse Bolt\\Controller\\BaseController;\nuse Bolt\\Entity\\Content;\nuse Bolt\\Entity\\Field;\n@@ -18,7 +17,6 @@ use Symfony\\Component\\Routing\\Annotation\\Route;\nuse Symfony\\Component\\Routing\\Generator\\UrlGeneratorInterface;\nuse Symfony\\Component\\Security\\Core\\Exception\\InvalidCsrfTokenException;\nuse Symfony\\Component\\Security\\Csrf\\CsrfToken;\n-use Symfony\\Component\\Security\\Csrf\\CsrfTokenManagerInterface;\n/**\n* Class EditRecordController.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/FinderController.php",
"new_path": "src/Controller/Backend/FinderController.php",
"diff": "@@ -13,6 +13,7 @@ use Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\Security;\nuse Symfony\\Component\\Finder\\Finder;\nuse Symfony\\Component\\HttpFoundation\\Request;\nuse Symfony\\Component\\Routing\\Annotation\\Route;\n+use Symfony\\Component\\Security\\Csrf\\CsrfTokenManagerInterface;\nuse Webmozart\\PathUtil\\Path;\n/**\n@@ -25,9 +26,10 @@ class FinderController extends BaseController\n/** @var Areas */\nprivate $areas;\n- public function __construct(Config $config, Areas $areas)\n+ public function __construct(Config $config, CsrfTokenManagerInterface $csrfTokenManager, Areas $areas)\n{\n- $this->config = $config;\n+ parent::__construct($config, $csrfTokenManager);\n+\n$this->areas = $areas;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/MediaController.php",
"new_path": "src/Controller/Backend/MediaController.php",
"diff": "@@ -14,6 +14,7 @@ use Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\Security;\nuse Symfony\\Component\\Finder\\Finder;\nuse Symfony\\Component\\HttpFoundation\\Request;\nuse Symfony\\Component\\Routing\\Annotation\\Route;\n+use Symfony\\Component\\Security\\Csrf\\CsrfTokenManagerInterface;\nuse Tightenco\\Collect\\Support\\Collection;\nuse Webmozart\\PathUtil\\Path;\n@@ -37,16 +38,17 @@ class MediaController extends BaseController\n* MediaController constructor.\n*\n* @param Config $config\n+ * @param CsrfTokenManagerInterface $csrfTokenManager\n* @param ObjectManager $manager\n* @param Areas $areas\n* @param MediaFactory $mediaFactory\n*/\n- public function __construct(Config $config, ObjectManager $manager, Areas $areas, MediaFactory $mediaFactory)\n+ public function __construct(Config $config, CsrfTokenManagerInterface $csrfTokenManager, ObjectManager $manager, Areas $areas, MediaFactory $mediaFactory)\n{\n- $this->config = $config;\n+ parent::__construct($config, $csrfTokenManager);\n+\n$this->manager = $manager;\n$this->areas = $areas;\n-\n$this->mediaFactory = $mediaFactory;\n}\n@@ -66,12 +68,14 @@ class MediaController extends BaseController\n$this->manager->flush();\n}\n+// dd($basepath);\n+\nreturn $this->renderTemplate('finder/finder.twig', [\n- 'path' => $path,\n- 'name' => $areas[$area]['name'],\n+ 'path' => 'path',\n+ 'name' => $this->areas->get($area, 'name'),\n'area' => $area,\n'finder' => $finder,\n- 'parent' => $parent,\n+ 'parent' => 'parent',\n]);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Frontend/ListingController.php",
"new_path": "src/Controller/Frontend/ListingController.php",
"diff": "@@ -5,6 +5,7 @@ declare(strict_types=1);\nnamespace Bolt\\Controller\\Frontend;\nuse Bolt\\Configuration\\Config;\n+use Bolt\\Content\\ContentType;\nuse Bolt\\Controller\\BaseController;\nuse Bolt\\Entity\\Content;\nuse Bolt\\Repository\\ContentRepository;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Frontend/SearchController.php",
"new_path": "src/Controller/Frontend/SearchController.php",
"diff": "@@ -43,7 +43,7 @@ class SearchController extends BaseController\n/** @var Content $records */\n$records = $content->findAll($page);\n- $contenttype = ContentType::factory($contenttypeslug, $this->config->get('contenttypes'));\n+ $contenttype = ContentType::factory('page', $this->config->get('contenttypes'));\n$templates = $this->templateChooser->listing($contenttype);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Frontend/TaxonomyController.php",
"new_path": "src/Controller/Frontend/TaxonomyController.php",
"diff": "@@ -40,7 +40,7 @@ class TaxonomyController extends BaseController\n/** @var Content $records */\n$records = $content->findAll($page);\n- $contenttype = ContentType::factory($contenttypeslug, $this->config->get('contenttypes'));\n+ $contenttype = ContentType::factory('page', $this->config->get('contenttypes'));\n$templates = $this->templateChooser->listing($contenttype);\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/finder/_quickselect.twig",
"new_path": "templates/finder/_quickselect.twig",
"diff": "-{% if allfiles %}\n+{% if allfiles|default() %}\n<div class=\"row mb-3\">\n<div class=\"selectize-control selectize form-control single\">\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Working on Controllers
|
95,149 |
16.11.2018 18:55:31
| -3,600 |
20dc4b609b9e531af832388d8be56adb7f32d4b0
|
Install npm in travis
|
[
{
"change_type": "MODIFY",
"old_path": ".travis.yml",
"new_path": ".travis.yml",
"diff": "@@ -22,10 +22,12 @@ matrix:\nbefore_install:\n- '[[ \"$TRAVIS_PHP_VERSION\" == \"nightly\" ]] || phpenv config-rm xdebug.ini'\n- composer self-update\n+ - nvm install 8.2\ninstall:\n- composer install\n- ./bin/phpunit install\n+ - npm install\nscript:\n- ./bin/phpunit\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Install npm in travis
|
95,149 |
16.11.2018 18:57:07
| -3,600 |
6cf41b2c0d34cb88e2d23c30690d0c583c9d001f
|
Add jest unittest execution to travis
|
[
{
"change_type": "MODIFY",
"old_path": ".travis.yml",
"new_path": ".travis.yml",
"diff": "@@ -45,3 +45,5 @@ script:\n- composer validate --strict\n# this checks that Doctrine's mapping configurations are valid\n- ./bin/console doctrine:schema:validate --skip-sync -vvv --no-interaction\n+ # run jest unit tests\n+ - npm test\n\\ No newline at end of file\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Add jest unittest execution to travis
|
95,149 |
16.11.2018 22:48:46
| -3,600 |
7e549fd257a9b1ecd89882f6098bcd1badcf7fe6
|
Add eslint and prettier as linter
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": ".eslintrc.js",
"diff": "+module.exports = {\n+ root: true,\n+ env: {\n+ node: true\n+ },\n+ extends: [\n+ \"plugin:vue/essential\",\n+ \"plugin:prettier/recommended\",\n+ \"eslint:recommended\"\n+ ],\n+ rules: {\n+ \"no-console\": process.env.NODE_ENV === \"production\" ? \"error\" : \"off\",\n+ \"no-debugger\": process.env.NODE_ENV === \"production\" ? \"error\" : \"off\"\n+ },\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "package-lock.json",
"new_path": "package-lock.json",
"diff": "\"uniq\": \"^1.0.1\"\n}\n},\n+ \"prettier\": {\n+ \"version\": \"1.13.7\",\n+ \"resolved\": \"https://registry.npmjs.org/prettier/-/prettier-1.13.7.tgz\",\n+ \"integrity\": \"sha512-KIU72UmYPGk4MujZGYMFwinB7lOf2LsDNGSOC8ufevsrPLISrZbNJlWstRi3m0AMuszbH+EFSQ/r6w56RSPK6w==\",\n+ \"dev\": true\n+ },\n\"supports-color\": {\n\"version\": \"5.5.0\",\n\"resolved\": \"https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz\",\n\"integrity\": \"sha512-4Vec1j+Op/z/ICdphePatzg97IVkPoG9ne+NE+0zRk9kfY9iA3XUtCVXYAQMD/cCbxKck55/smLvPO+cpKFvkQ==\"\n},\n\"flat-cache\": {\n- \"version\": \"1.3.2\",\n- \"resolved\": \"https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.2.tgz\",\n- \"integrity\": \"sha512-KByBY8c98sLUAGpnmjEdWTrtrLZRtZdwds+kAL/ciFXTCb7AZgqKsAnVnYFQj1hxepwO8JKN/8AsRWwLq+RK0A==\",\n+ \"version\": \"1.3.4\",\n+ \"resolved\": \"https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz\",\n+ \"integrity\": \"sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==\",\n\"dev\": true,\n\"requires\": {\n\"circular-json\": \"^0.3.1\",\n- \"del\": \"^3.0.0\",\n\"graceful-fs\": \"^4.1.2\",\n+ \"rimraf\": \"~2.6.2\",\n\"write\": \"^0.2.1\"\n}\n},\n\"dev\": true\n},\n\"prettier\": {\n- \"version\": \"1.13.7\",\n- \"resolved\": \"https://registry.npmjs.org/prettier/-/prettier-1.13.7.tgz\",\n- \"integrity\": \"sha512-KIU72UmYPGk4MujZGYMFwinB7lOf2LsDNGSOC8ufevsrPLISrZbNJlWstRi3m0AMuszbH+EFSQ/r6w56RSPK6w==\",\n+ \"version\": \"1.15.2\",\n+ \"resolved\": \"https://registry.npmjs.org/prettier/-/prettier-1.15.2.tgz\",\n+ \"integrity\": \"sha512-YgPLFFA0CdKL4Eg2IHtUSjzj/BWgszDHiNQAe0VAIBse34148whfdzLagRL+QiKS+YfK5ftB6X4v/MBw8yCoug==\",\n\"dev\": true\n},\n\"prettier-linter-helpers\": {\n},\n\"require-uncached\": {\n\"version\": \"1.0.3\",\n- \"resolved\": \"http://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz\",\n\"integrity\": \"sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=\",\n\"dev\": true,\n\"requires\": {\n},\n\"espree\": {\n\"version\": \"3.5.4\",\n- \"resolved\": \"https://registry.npmjs.org/espree/-/espree-3.5.4.tgz\",\n+ \"resolved\": \"http://registry.npmjs.org/espree/-/espree-3.5.4.tgz\",\n\"integrity\": \"sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==\",\n\"dev\": true,\n\"requires\": {\n"
},
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"babel-core\": \"^7.0.0-bridge.0\",\n\"babel-jest\": \"^23.6.0\",\n\"eslint\": \"5.9.0\",\n- \"eslint-config-prettier\": \"3.3.0\",\n- \"eslint-plugin-prettier\": \"3.0.0\",\n+ \"eslint-config-prettier\": \"^3.3.0\",\n+ \"eslint-plugin-prettier\": \"^3.0.0\",\n\"eslint-plugin-vue\": \"^4.7.1\",\n\"jest\": \"^23.6.0\",\n\"jest-serializer-vue\": \"^2.0.2\",\n\"node-sass\": \"^4.10.0\",\n\"postcss-loader\": \"^3.0.0\",\n\"postcss-preset-env\": \"^6.4.0\",\n+ \"prettier\": \"1.15.2\",\n\"regenerator-runtime\": \"^0.12.1\",\n\"register-service-worker\": \"^1.5.2\",\n\"sass-loader\": \"^7.1.0\",\n\"build\": \"encore production --progress\",\n\"test\": \"jest\"\n},\n- \"eslintConfig\": {\n- \"root\": true,\n- \"extends\": [\n- \"plugin:vue/essential\",\n- \"eslint:recommended\"\n- ]\n- },\n\"browserslist\": [\n\"> 1%\"\n],\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Add eslint and prettier as linter
|
95,144 |
17.11.2018 15:01:28
| -3,600 |
dc49d3ef634b5c55b5e30102023f13aa048698f6
|
Clean up Dashboardcontroller
|
[
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/DashboardController.php",
"new_path": "src/Controller/Backend/DashboardController.php",
"diff": "@@ -18,13 +18,16 @@ class DashboardController extends BaseController\n{\n/**\n* @Route(\"/\", name=\"bolt_dashboard\")\n- * was: (\"/{vueRouting}\", requirements={\"vueRouting\"=\"^(?!api|_(profiler|wdt)).+\"}, name=\"index\")\n*\n* @param ContentRepository $content\n*\n+ * @throws \\Twig_Error_Loader\n+ * @throws \\Twig_Error_Runtime\n+ * @throws \\Twig_Error_Syntax\n+ *\n* @return Response\n*/\n- public function index(ContentRepository $content)\n+ public function index(ContentRepository $content): Response\n{\n/** @var Content $records */\n$records = $content->findLatest();\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Clean up Dashboardcontroller
|
95,144 |
17.11.2018 15:50:44
| -3,600 |
f4b43de4da785864fc414afb9cd4e4b0d6978004
|
Fixing up content_overview controller
|
[
{
"change_type": "MODIFY",
"old_path": "src/Content/MenuBuilder.php",
"new_path": "src/Content/MenuBuilder.php",
"diff": "@@ -79,7 +79,7 @@ class MenuBuilder\nforeach ($contenttypes as $contenttype) {\n$menu->addChild($contenttype['slug'], [\n- 'uri' => $this->urlGenerator->generate('bolt_contentlisting', ['contenttype' => $contenttype['slug']]),\n+ 'uri' => $this->urlGenerator->generate('bolt_content_overview', ['contenttype' => $contenttype['slug']]),\n'extras' => [\n'name' => $contenttype['name'],\n'singular_name' => $contenttype['singular_name'],\n"
},
{
"change_type": "RENAME",
"old_path": "src/Controller/Backend/ListingController.php",
"new_path": "src/Controller/Backend/ContentOverviewController.php",
"diff": "@@ -17,10 +17,10 @@ use Symfony\\Component\\Routing\\Annotation\\Route;\n*\n* @Security(\"has_role('ROLE_ADMIN')\")\n*/\n-class ListingController extends BaseController\n+class ContentOverviewController extends BaseController\n{\n/**\n- * @Route(\"/content/{contenttype}\", name=\"bolt_contentlisting\")\n+ * @Route(\"/content/{contenttype}\", name=\"bolt_content_overview\")\n*\n* @param ContentRepository $content\n* @param Request $request\n@@ -32,13 +32,12 @@ class ListingController extends BaseController\n*\n* @return Response\n*/\n- public function listing(ContentRepository $content, Request $request, string $contenttype = ''): Response\n+ public function overview(ContentRepository $content, Request $request, string $contenttype = ''): Response\n{\n$contenttype = ContentType::factory($contenttype, $this->config->get('contenttypes'));\n$page = (int) $request->query->get('page', 1);\n- /** @var Content $records */\n$records = $content->findAll($page, $contenttype);\nreturn $this->renderTemplate('content/listing.html.twig', [\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_partials/_pager.html.twig",
"new_path": "templates/_partials/_pager.html.twig",
"diff": "{% if records.haveToPaginate|default() %}\n<div class=\"pagination\">\n{{ pagerfanta(records, {\n- routeName: 'bolt_contentlisting',\n+ routeName: 'bolt_content_overview',\nrouteParams: { 'contenttype': contenttype.slug|default() }\n}) }}\n</div>\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Fixing up content_overview controller
|
95,144 |
17.11.2018 16:17:22
| -3,600 |
78c0d562ddcdff7fe648fe4c3a2afa158db02200
|
Adding Omnisearch controller
|
[
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/ContentEditController.php",
"new_path": "src/Controller/Backend/ContentEditController.php",
"diff": "@@ -82,7 +82,13 @@ class ContentEditController extends BaseController\nreturn new RedirectResponse($url);\n}\n- private function contentFromPost(Content $content = null, Request $request)\n+ /**\n+ * @param Content|null $content\n+ * @param Request $request\n+ *\n+ * @return Content\n+ */\n+ private function contentFromPost(Content $content, Request $request): Content\n{\n$post = $request->request->all();\n@@ -104,7 +110,12 @@ class ContentEditController extends BaseController\nreturn $content;\n}\n- private function updateFieldFromPost(string $key, $postfield, Content $content)\n+ /**\n+ * @param string $key\n+ * @param mixed $postfield\n+ * @param Content $content\n+ */\n+ private function updateFieldFromPost(string $key, $postfield, Content $content): void\n{\nif (!$field = $content->getField($key)) {\n$fields = collect($content->getDefinition()->get('fields'));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/GeneralController.php",
"new_path": "src/Controller/Backend/GeneralController.php",
"diff": "@@ -5,28 +5,46 @@ declare(strict_types=1);\nnamespace Bolt\\Controller\\Backend;\nuse Bolt\\Controller\\BaseController;\n+use Symfony\\Component\\HttpFoundation\\Response;\nuse Symfony\\Component\\Routing\\Annotation\\Route;\nclass GeneralController extends BaseController\n{\n/**\n* @Route(\"/about\", name=\"bolt_about\")\n+ *\n+ * @throws \\Twig_Error_Loader\n+ * @throws \\Twig_Error_Runtime\n+ * @throws \\Twig_Error_Syntax\n+ *\n+ * @return Response\n*/\n- public function about()\n+ public function about(): Response\n{\nreturn $this->renderTemplate('pages/about.html.twig');\n}\n/**\n* @Route(\"/kitchensink\", name=\"bolt_kitchensink\")\n+ *\n+ * @throws \\Twig_Error_Loader\n+ * @throws \\Twig_Error_Runtime\n+ * @throws \\Twig_Error_Syntax\n+ *\n+ * @return Response\n*/\n- public function kitchensink()\n+ public function kitchensink(): Response\n{\n$this->addFlash('success', '<strong>Well done!</strong> You successfully read this important alert message.');\n$this->addFlash('info', '<strong>Heads up!</strong> This alert needs your attention, but it\\'s not super important.');\n$this->addFlash('warning', '<strong>Warning!</strong> Better check yourself, you\\'re not looking too good.');\n$this->addFlash('danger', '<strong>Oh snap!</strong> Change a few things up and try submitting again.');\n- return $this->renderTemplate('pages/about.html.twig');\n+ $twigVars = [\n+ 'title' => 'Kitchensink',\n+ 'subtitle' => 'To show a number of different things, on one page',\n+ ];\n+\n+ return $this->renderTemplate('pages/placeholder.html.twig', $twigVars);\n}\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Controller/Backend/OmnisearchController.php",
"diff": "+<?php\n+\n+declare(strict_types=1);\n+\n+namespace Bolt\\Controller\\Backend;\n+\n+use Bolt\\Controller\\BaseController;\n+use Symfony\\Component\\HttpFoundation\\Response;\n+use Symfony\\Component\\Routing\\Annotation\\Route;\n+\n+class OmnisearchController extends BaseController\n+{\n+ /**\n+ * @Route(\"/omnisearch\", name=\"bolt_omnisearch\")\n+ */\n+ public function omnisearch(): Response\n+ {\n+ $twigVars = [\n+ 'title' => 'Omnisearch',\n+ 'subtitle' => 'To search, in an omni-like fashion',\n+ ];\n+\n+ return $this->renderTemplate('pages/placeholder.html.twig', $twigVars);\n+ }\n+}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Adding Omnisearch controller
|
95,144 |
17.11.2018 16:39:09
| -3,600 |
6f7e403e560559dc362cd6ae38c2a3bd322c8c01
|
Create ResetPasswordController.php
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Controller/Backend/ResetPasswordController.php",
"diff": "+<?php\n+\n+declare(strict_types=1);\n+\n+namespace Bolt\\Controller\\Backend;\n+\n+use Bolt\\Controller\\BaseController;\n+use Symfony\\Component\\HttpFoundation\\Response;\n+use Symfony\\Component\\Routing\\Annotation\\Route;\n+\n+class ResetPasswordController extends BaseController\n+{\n+ /**\n+ * @Route(\"/resetpassword\", name=\"bolt_resetpassword\")\n+ */\n+ public function omnisearch(): Response\n+ {\n+ $twigVars = [\n+ 'title' => 'Reset Password',\n+ 'subtitle' => 'To reset your password, if you\\'ve misplaced it',\n+ ];\n+\n+ return $this->renderTemplate('pages/placeholder.html.twig', $twigVars);\n+ }\n+}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Create ResetPasswordController.php
|
95,144 |
17.11.2018 16:49:51
| -3,600 |
0004093260471f2bd1880e305e856ec3b13978f2
|
Adding FixturesController and DatabaseIntegrityController
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Controller/Backend/DatabaseIntegrityController.php",
"diff": "+<?php\n+\n+declare(strict_types=1);\n+\n+namespace Bolt\\Controller\\Backend;\n+\n+use Bolt\\Controller\\BaseController;\n+use Symfony\\Component\\HttpFoundation\\Response;\n+use Symfony\\Component\\Routing\\Annotation\\Route;\n+\n+class DatabaseIntegrityController extends BaseController\n+{\n+ /**\n+ * @Route(\"/database-check\", name=\"bolt_database_check\")\n+ */\n+ public function check(): Response\n+ {\n+ $twigVars = [\n+ 'title' => 'Database Check',\n+ 'subtitle' => 'To check the Database',\n+ ];\n+\n+ return $this->renderTemplate('pages/placeholder.html.twig', $twigVars);\n+ }\n+\n+ /**\n+ * @Route(\"/database-update\", name=\"bolt_database_update\")\n+ */\n+ public function update(): Response\n+ {\n+ $twigVars = [\n+ 'title' => 'Database Update',\n+ 'subtitle' => 'To update the Database',\n+ ];\n+\n+ return $this->renderTemplate('pages/placeholder.html.twig', $twigVars);\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Controller/Backend/FixturesController.php",
"diff": "+<?php\n+\n+declare(strict_types=1);\n+\n+namespace Bolt\\Controller\\Backend;\n+\n+use Bolt\\Controller\\BaseController;\n+use Symfony\\Component\\HttpFoundation\\Response;\n+use Symfony\\Component\\Routing\\Annotation\\Route;\n+\n+class FixturesController extends BaseController\n+{\n+ /**\n+ * @Route(\"/fixtures\", name=\"bolt_fixtures\")\n+ */\n+ public function omnisearch(): Response\n+ {\n+ $twigVars = [\n+ 'title' => 'Fixtures',\n+ 'subtitle' => 'To add Fixtures, or \"Dummy Content\".',\n+ ];\n+\n+ return $this->renderTemplate('pages/placeholder.html.twig', $twigVars);\n+ }\n+}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Adding FixturesController and DatabaseIntegrityController
|
95,144 |
17.11.2018 17:39:10
| -3,600 |
57ea474da78eeeb020e72765bb160f3b405520f2
|
Rename Finder to Filemanager, split users
|
[
{
"change_type": "MODIFY",
"old_path": "src/Content/MenuBuilder.php",
"new_path": "src/Content/MenuBuilder.php",
"diff": "@@ -157,7 +157,7 @@ class MenuBuilder\n]);\n$menu['Configuration']->addChild('All configuration files', [\n- 'uri' => $this->urlGenerator->generate('bolt_finder', ['area' => 'config']),\n+ 'uri' => $this->urlGenerator->generate('bolt_filemanager', ['area' => 'config']),\n'extras' => [\n'name' => $t->trans('caption.all_configuration_files'),\n'icon' => 'fa-cogs',\n@@ -235,7 +235,7 @@ class MenuBuilder\n]]);\n$menu['File Management']->addChild('Uploaded files', [\n- 'uri' => $this->urlGenerator->generate('bolt_finder', ['area' => 'files']),\n+ 'uri' => $this->urlGenerator->generate('bolt_filemanager', ['area' => 'files']),\n'extras' => [\n'name' => $t->trans('caption.uploaded_files'),\n'icon' => 'fa-archive',\n@@ -243,7 +243,7 @@ class MenuBuilder\n]);\n$menu['File Management']->addChild('View/edit Templates', [\n- 'uri' => $this->urlGenerator->generate('bolt_finder', ['area' => 'themes']),\n+ 'uri' => $this->urlGenerator->generate('bolt_filemanager', ['area' => 'themes']),\n'extras' => [\n'name' => $t->trans('caption.view_edit_templates'),\n'icon' => 'fa-scroll',\n"
},
{
"change_type": "RENAME",
"old_path": "src/Controller/Backend/FinderController.php",
"new_path": "src/Controller/Backend/FilemanagerController.php",
"diff": "@@ -12,6 +12,7 @@ use Bolt\\Repository\\MediaRepository;\nuse Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\Security;\nuse Symfony\\Component\\Finder\\Finder;\nuse Symfony\\Component\\HttpFoundation\\Request;\n+use Symfony\\Component\\HttpFoundation\\Response;\nuse Symfony\\Component\\Routing\\Annotation\\Route;\nuse Symfony\\Component\\Security\\Csrf\\CsrfTokenManagerInterface;\nuse Webmozart\\PathUtil\\Path;\n@@ -21,7 +22,7 @@ use Webmozart\\PathUtil\\Path;\n*\n* @Security(\"has_role('ROLE_ADMIN')\")\n*/\n-class FinderController extends BaseController\n+class FilemanagerController extends BaseController\n{\n/** @var Areas */\nprivate $areas;\n@@ -34,15 +35,19 @@ class FinderController extends BaseController\n}\n/**\n- * @Route(\"/finder/{area}\", name=\"bolt_finder\", methods={\"GET\"})\n+ * @Route(\"/filemanager/{area}\", name=\"bolt_filemanager\", methods={\"GET\"})\n*\n* @param $area\n* @param Request $request\n* @param MediaRepository $mediaRepository\n*\n+ * @throws \\Twig_Error_Loader\n+ * @throws \\Twig_Error_Runtime\n+ * @throws \\Twig_Error_Syntax\n+ *\n* @return \\Symfony\\Component\\HttpFoundation\\Response\n*/\n- public function finder($area, Request $request, MediaRepository $mediaRepository)\n+ public function filemanager($area, Request $request, MediaRepository $mediaRepository): Response\n{\n$path = $request->query->get('path');\nif (!str::endsWith($path, '/')) {\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Controller/Backend/ProfileController.php",
"diff": "+<?php\n+\n+declare(strict_types=1);\n+\n+namespace Bolt\\Controller\\Backend;\n+\n+use Bolt\\Controller\\BaseController;\n+use Doctrine\\Common\\Persistence\\ObjectManager;\n+use Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\Security;\n+use Symfony\\Component\\HttpFoundation\\RedirectResponse;\n+use Symfony\\Component\\HttpFoundation\\Request;\n+use Symfony\\Component\\HttpFoundation\\Response;\n+use Symfony\\Component\\Routing\\Annotation\\Route;\n+use Symfony\\Component\\Routing\\Generator\\UrlGeneratorInterface;\n+use Symfony\\Component\\Security\\Core\\Encoder\\UserPasswordEncoderInterface;\n+\n+/**\n+ * Class UserController.\n+ *\n+ * @Security(\"has_role('ROLE_ADMIN')\")\n+ */\n+class ProfileController extends BaseController\n+{\n+ /**\n+ * @Route(\"/profile-edit\", methods={\"GET\"}, name=\"bolt_profile_edit\")\n+ *\n+ * @param Request $request\n+ *\n+ * @throws \\Twig_Error_Loader\n+ * @throws \\Twig_Error_Runtime\n+ * @throws \\Twig_Error_Syntax\n+ *\n+ * @return Response\n+ */\n+ public function profileEdit(Request $request): Response\n+ {\n+ $user = $this->getUser();\n+\n+ return $this->renderTemplate('users/edit.html.twig', [\n+ 'usertitle' => $user->getFullName(),\n+ 'user' => $user,\n+ ]);\n+ }\n+\n+ /**\n+ * @Route(\"/profile-edit\", methods={\"POST\"}, name=\"bolt_profile_edit_post\")\n+ *\n+ * @param Request $request\n+ * @param UrlGeneratorInterface $urlGenerator\n+ * @param ObjectManager $manager\n+ * @param UserPasswordEncoderInterface $encoder\n+ *\n+ * @throws \\Twig_Error_Loader\n+ * @throws \\Twig_Error_Runtime\n+ * @throws \\Twig_Error_Syntax\n+ *\n+ * @return Response\n+ */\n+ public function profileEditPost(Request $request, UrlGeneratorInterface $urlGenerator, ObjectManager $manager, UserPasswordEncoderInterface $encoder): Response\n+ {\n+ $user = $this->getUser();\n+ $userTitle = $user->getFullName();\n+ $url = $urlGenerator->generate('bolt_profile_edit');\n+ $locale = current($request->get('locale'));\n+ $newPassword = $request->get('password');\n+\n+ $user->setFullName($request->get('fullName'));\n+ $user->setEmail($request->get('email'));\n+ $user->setLocale($locale);\n+ $user->setbackendTheme($request->get('user')['backendTheme']);\n+\n+ $hasError = false;\n+\n+ $usernameValidateOptions = [\n+ 'options' => [\n+ 'min_range' => 1,\n+ ],\n+ ];\n+\n+ // Validate username\n+ if (!filter_var(mb_strlen($user->getFullName()), FILTER_VALIDATE_INT, $usernameValidateOptions)) {\n+ $this->addFlash('danger', 'user.not_valid_username');\n+ $hasError = true;\n+ }\n+\n+ // Validate password\n+ if (!empty($newPassword) && mb_strlen($newPassword) < 6) {\n+ $this->addFlash('danger', 'user.not_valid_password');\n+ $hasError = true;\n+ } elseif (!empty($newPassword) && mb_strlen($newPassword) > 6) {\n+ $user->setPassword($encoder->encodePassword($user, $newPassword));\n+ }\n+\n+ // Validate email\n+ if (!filter_var($user->getEmail(), FILTER_VALIDATE_EMAIL)) {\n+ $this->addFlash('danger', 'user.not_valid_email');\n+ $hasError = true;\n+ }\n+\n+ if ($hasError) {\n+ return $this->renderTemplate('users/edit.html.twig', [\n+ 'usertitle' => $userTitle,\n+ 'user' => $user,\n+ ]);\n+ }\n+\n+ $manager->flush();\n+\n+ $request->getSession()->set('_locale', $locale);\n+\n+ return new RedirectResponse($url);\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/UserController.php",
"new_path": "src/Controller/Backend/UserController.php",
"diff": "@@ -5,14 +5,9 @@ declare(strict_types=1);\nnamespace Bolt\\Controller\\Backend;\nuse Bolt\\Controller\\BaseController;\n-use Doctrine\\Common\\Persistence\\ObjectManager;\nuse Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\Security;\n-use Symfony\\Component\\HttpFoundation\\RedirectResponse;\n-use Symfony\\Component\\HttpFoundation\\Request;\nuse Symfony\\Component\\HttpFoundation\\Response;\nuse Symfony\\Component\\Routing\\Annotation\\Route;\n-use Symfony\\Component\\Routing\\Generator\\UrlGeneratorInterface;\n-use Symfony\\Component\\Security\\Core\\Encoder\\UserPasswordEncoderInterface;\n/**\n* Class UserController.\n@@ -24,98 +19,13 @@ class UserController extends BaseController\n/**\n* @Route(\"/users\", name=\"bolt_users\")\n*/\n- public function users()\n+ public function users(): Response\n{\n- return $this->renderTemplate('pages/about.html.twig');\n- }\n-\n- /**\n- * @Route(\"/profile-edit\", methods={\"GET\"}, name=\"bolt_profile_edit\")\n- *\n- * @param Request $request\n- *\n- * @throws \\Twig_Error_Loader\n- * @throws \\Twig_Error_Runtime\n- * @throws \\Twig_Error_Syntax\n- *\n- * @return Response\n- */\n- public function edit(Request $request): Response\n- {\n- $user = $this->getUser();\n-\n- return $this->renderTemplate('users/edit.html.twig', [\n- 'usertitle' => $user->getFullName(),\n- 'user' => $user,\n- ]);\n- }\n-\n- /**\n- * @Route(\"/profile-edit\", methods={\"POST\"}, name=\"bolt_profile_edit_post\")\n- *\n- * @param Request $request\n- * @param UrlGeneratorInterface $urlGenerator\n- * @param ObjectManager $manager\n- * @param UserPasswordEncoderInterface $encoder\n- *\n- * @throws \\Twig_Error_Loader\n- * @throws \\Twig_Error_Runtime\n- * @throws \\Twig_Error_Syntax\n- *\n- * @return Response\n- */\n- public function edit_post(Request $request, UrlGeneratorInterface $urlGenerator, ObjectManager $manager, UserPasswordEncoderInterface $encoder): Response\n- {\n- $user = $this->getUser();\n- $userTitle = $user->getFullName();\n- $url = $urlGenerator->generate('bolt_profile_edit');\n- $locale = current($request->get('locale'));\n- $newPassword = $request->get('password');\n-\n- $user->setFullName($request->get('fullName'));\n- $user->setEmail($request->get('email'));\n- $user->setLocale($locale);\n- $user->setbackendTheme($request->get('user')['backendTheme']);\n-\n- $hasError = false;\n-\n- $usernameValidateOptions = [\n- 'options' => [\n- 'min_range' => 1,\n- ],\n+ $twigVars = [\n+ 'title' => 'Users & Permissions',\n+ 'subtitle' => 'To edit users and their permissions',\n];\n- // Validate username\n- if (!filter_var(mb_strlen($user->getFullName()), FILTER_VALIDATE_INT, $usernameValidateOptions)) {\n- $this->addFlash('danger', 'user.not_valid_username');\n- $hasError = true;\n- }\n-\n- // Validate password\n- if (!empty($newPassword) && mb_strlen($newPassword) < 6) {\n- $this->addFlash('danger', 'user.not_valid_password');\n- $hasError = true;\n- } elseif (!empty($newPassword) && mb_strlen($newPassword) > 6) {\n- $user->setPassword($encoder->encodePassword($user, $newPassword));\n- }\n-\n- // Validate email\n- if (!filter_var($user->getEmail(), FILTER_VALIDATE_EMAIL)) {\n- $this->addFlash('danger', 'user.not_valid_email');\n- $hasError = true;\n- }\n-\n- if ($hasError) {\n- return $this->renderTemplate('users/edit.html.twig', [\n- 'usertitle' => $userTitle,\n- 'user' => $user,\n- ]);\n- }\n-\n- $manager->flush();\n-\n- $request->getSession()->set('_locale', $locale);\n-\n- return new RedirectResponse($url);\n+ return $this->renderTemplate('pages/placeholder.html.twig', $twigVars);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/finder/_folders.html.twig",
"new_path": "templates/finder/_folders.html.twig",
"diff": "<td><i class=\"fas fa-folder-open\"></i></td>\n<td>\n<b>\n- <a href=\"{{ path('bolt_finder', {'area': area, 'path': parent }) }}\">\n+ <a href=\"{{ path('bolt_filemanager', {'area': area, 'path': parent }) }}\">\n../\n</a>\n</b>\n<td>\n<b>\n{% set dirname = path ~ directory.getRelativePathname() %}\n- <a href=\"{{ path('bolt_finder', {'area': area, 'path': dirname }) }}\">\n+ <a href=\"{{ path('bolt_filemanager', {'area': area, 'path': dirname }) }}\">\n{{ directory.getRelativePathname }}/\n</a>\n</b>\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Rename Finder to Filemanager, split users
|
95,144 |
17.11.2018 17:45:13
| -3,600 |
4fef9136b2d6f38a93456e10da05e9283fa9b93d
|
Tweaking File edit routes
|
[
{
"change_type": "MODIFY",
"old_path": "public/theme/skeleton/README.md",
"new_path": "public/theme/skeleton/README.md",
"diff": "@@ -9,3 +9,5 @@ Features:\n- Simple design, function over form.\n- Uses [Sakura](https://github.com/oxalorg/sakura) as a minimal CSS theme.\n- No Javascript.\n+\n+ Aw yiss.\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "public/theme/skeleton/partials/_fresh_install.twig",
"new_path": "public/theme/skeleton/partials/_fresh_install.twig",
"diff": "<p>This is a minimal theme, with a modular structure. It is well suited to build your own theme's on top of.</p>\n<ul>\n<li>Check the <a href='https://github.com/bolt/themes/blob/master/readme.md'>readme.md</a> for instructions on how to customize this theme.</li>\n- <li><a href='{{ path('bolt_edit_file', {'area': 'themes', 'file': 'skeleton/index.twig'}) }}'>Edit this template</a>, to get rid of this 'callout'.</li>\n+ <li><a href='{{ path('bolt_file_edit', {'area': 'themes', 'file': 'skeleton/index.twig'}) }}'>Edit this template</a>, to get rid of this 'callout'.</li>\n</ul>\n<small>Note: Only registered users will see this. This piece of content is hidden from regular visitors.</small>\n</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Content/MenuBuilder.php",
"new_path": "src/Content/MenuBuilder.php",
"diff": "@@ -116,7 +116,7 @@ class MenuBuilder\n]);\n$menu['Configuration']->addChild('Main configuration', [\n- 'uri' => $this->urlGenerator->generate('bolt_edit_file', ['area' => 'config', 'file' => '/bolt/config.yaml']),\n+ 'uri' => $this->urlGenerator->generate('bolt_file_edit', ['area' => 'config', 'file' => '/bolt/config.yaml']),\n'extras' => [\n'name' => $t->trans('caption.main_configuration'),\n'icon' => 'fa-cog',\n@@ -124,7 +124,7 @@ class MenuBuilder\n]);\n$menu['Configuration']->addChild('ContentTypes', [\n- 'uri' => $this->urlGenerator->generate('bolt_edit_file', ['area' => 'config', 'file' => '/bolt/contenttypes.yaml']),\n+ 'uri' => $this->urlGenerator->generate('bolt_file_edit', ['area' => 'config', 'file' => '/bolt/contenttypes.yaml']),\n'extras' => [\n'name' => $t->trans('caption.contenttypes'),\n'icon' => 'fa-object-group',\n@@ -132,7 +132,7 @@ class MenuBuilder\n]);\n$menu['Configuration']->addChild('Taxonomies', [\n- 'uri' => $this->urlGenerator->generate('bolt_edit_file', ['area' => 'config', 'file' => '/bolt/taxonomy.yaml']),\n+ 'uri' => $this->urlGenerator->generate('bolt_file_edit', ['area' => 'config', 'file' => '/bolt/taxonomy.yaml']),\n'extras' => [\n'name' => $t->trans('caption.taxonomies'),\n'icon' => 'fa-tags',\n@@ -140,7 +140,7 @@ class MenuBuilder\n]);\n$menu['Configuration']->addChild('Menu set up', [\n- 'uri' => $this->urlGenerator->generate('bolt_edit_file', ['area' => 'config', 'file' => '/bolt/menu.yaml']),\n+ 'uri' => $this->urlGenerator->generate('bolt_file_edit', ['area' => 'config', 'file' => '/bolt/menu.yaml']),\n'extras' => [\n'name' => $t->trans('caption.menu_setup'),\n'type' => 'separator',\n@@ -149,7 +149,7 @@ class MenuBuilder\n]);\n$menu['Configuration']->addChild('Routing set up', [\n- 'uri' => $this->urlGenerator->generate('bolt_edit_file', ['area' => 'config', 'file' => '/routes.yaml']),\n+ 'uri' => $this->urlGenerator->generate('bolt_file_edit', ['area' => 'config', 'file' => '/routes.yaml']),\n'extras' => [\n'name' => $t->trans('caption.routing_setup'),\n'icon' => 'fa-directions',\n"
},
{
"change_type": "RENAME",
"old_path": "src/Controller/Backend/EditFileController.php",
"new_path": "src/Controller/Backend/FileEditController.php",
"diff": "@@ -22,10 +22,10 @@ use Webmozart\\PathUtil\\Path;\n*\n* @Security(\"has_role('ROLE_ADMIN')\")\n*/\n-class EditFileController extends BaseController\n+class FileEditController extends BaseController\n{\n/**\n- * @Route(\"/editfile/{area}\", name=\"bolt_edit_file\", methods={\"GET\"})\n+ * @Route(\"/file-edit/{area}\", name=\"bolt_file_edit\", methods={\"GET\"})\n*\n* @param string $area\n* @param Request $request\n@@ -56,7 +56,7 @@ class EditFileController extends BaseController\n}\n/**\n- * @Route(\"/editfile/{area}\", name=\"bolt_edit_file_post\", methods={\"POST\"}, requirements={\"file\"=\".+\"})\n+ * @Route(\"/file-edit/{area}\", name=\"bolt_file-edit_post\", methods={\"POST\"}, requirements={\"file\"=\".+\"})\n*\n* @param Request $request\n* @param UrlGeneratorInterface $urlGenerator\n@@ -80,7 +80,7 @@ class EditFileController extends BaseController\n$contents = $request->request->get('editfile');\n$extension = Path::getExtension($file);\n- $url = $urlGenerator->generate('bolt_edit_file', ['area' => $area, 'file' => $file]);\n+ $url = $urlGenerator->generate('bolt_file_edit', ['area' => $area, 'file' => $file]);\nif (in_array($extension, ['yml', 'yaml'], true) && !$this->verifyYaml($contents)) {\n$context = [\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/AdminExtension.php",
"new_path": "src/Twig/AdminExtension.php",
"diff": "@@ -59,7 +59,7 @@ class AdminExtension extends AbstractExtension\nreturn preg_replace_callback(\n'/([a-z0-9_-]+\\.yml)/i',\nfunction ($matches) {\n- $path = $this->urlGenerator->generate('bolt_edit_file', ['area' => 'config', 'file' => '/' . $matches[1]]);\n+ $path = $this->urlGenerator->generate('bolt_file_edit', ['area' => 'config', 'file' => '/' . $matches[1]]);\n$link = sprintf(' <a href=\"%s\">%s</a>', $path, $matches[1]);\nreturn $link;\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "templates/editcontent/fields/_base.html.twig",
"diff": "+{%- spaceless -%}\n+\n+{# Set type #}\n+{% set type = field.type|default() %}\n+\n+{# Set variant #}\n+{% set variant = define.variant|default('normal') %}\n+\n+{# Set the name #}\n+{% if not name|default() %}\n+ {% set name = 'fields[' ~ field.name ~ ']' %}\n+{% endif %}\n+\n+{# Set the id #}\n+{% if not id|default() %}\n+ {% set id = 'field-' ~ field.name|default(name) %}\n+{% endif %}\n+\n+{# Set the form #}\n+{% if not form|default() %}\n+ {% set form = 'editcontent' %}\n+{% endif %}\n+\n+{# Set the value #}\n+{% if not value|default() %}\n+ {% if field.value is defined %}\n+ {% set value = field.value|join|default() %}\n+ {% else %}\n+ {% set value = '' %}\n+ {% endif %}\n+{% endif %}\n+\n+{# Set the class #}\n+{% if not class|default() %}\n+ {% set class = field.definition.class|default() %}\n+{% endif %}\n+\n+{% set class = class %}\n+\n+\n+{# Set the label #}\n+{% if not label|default() %}\n+ {% set label = field.definition.label|default(field.name|ucwords) ~ ':' %}\n+{% endif %}\n+\n+{# Set the prefix and postfix attributes #}\n+{% set prefix = prefix|default(field.definition.prefix|default()) %}\n+{% if prefix and not ('<p' in prefix or '<span' in prefix or '<div' in prefix) %}\n+ {% set prefix = '<span id=\"' ~ id ~ '_prefix\" class=\"form--helper\">' ~ prefix ~ '</span>' %}\n+{% endif %}\n+{% set postfix = postfix|default(field.definition.postfix|default()) %}\n+{% if postfix and not ('<p' in postfix or '<span' in postfix or '<div' in postfix) %}\n+ {% set postfix = '<span id=\"' ~ id ~ '_postfix\" class=\"form--helper\">' ~ postfix ~ '</span>' %}\n+{% endif %}\n+\n+{%- endspaceless -%}\n+\n+\n+<!-- field \" {{ type }} {{ variant }} {{ label }} {{ name }} -->\n+<div class=\"form-group editor--group is-{{variant}}\">\n+{% if prefix %}\n+ {% include 'editcontent/fields/_partials/_helper.html.twig' with { type: 'prefix', message: prefix} %}\n+{% endif %}\n+{% block label %}\n+ {% include 'editcontent/fields/_partials/_label.html.twig' %}\n+{% endblock %}\n+{% block field %}\n+\n+{% endblock %}\n+{% if postfix %}\n+ {% include 'editcontent/fields/_partials/_helper.html.twig' with { type: 'postfix', message: postfix} %}\n+{% endif %}\n+</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/finder/_files.html.twig",
"new_path": "templates/finder/_files.html.twig",
"diff": "{% set extension = file.extension() %}\n{% set filename = path ~ file.getRelativePathname() %}\n{% set icon = 'fa-file' %}\n- {% set link = path('bolt_edit_file', {'area': area, 'file': filename }) %}\n+ {% set link = path('bolt_file_edit', {'area': area, 'file': filename }) %}\n{% set thumbnail = '' %}\n{% set title = '' %}\n{% set dimensions = '' %}\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/finder/_quickselect.html.twig",
"new_path": "templates/finder/_quickselect.html.twig",
"diff": "},\noptions: [\n{% for file in allfiles %}\n- { value: '{{ path('bolt_edit_file', {'area': 'config', 'file': file.filename}) }}', filename: '{{ file.filename }}', description: '{{ file.description }}'},\n+ { value: '{{ path('bolt_file_edit', {'area': 'config', 'file': file.filename}) }}', filename: '{{ file.filename }}', description: '{{ file.description }}'},\n{% endfor %}\n],\nrender: {\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Tweaking File edit routes
|
95,144 |
17.11.2018 18:12:18
| -3,600 |
fff67d3629ce25dab820de282a9c8a90492f4826
|
Tweaking PHPDOC for backend controllers
|
[
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/AuthenticationController.php",
"new_path": "src/Controller/Backend/AuthenticationController.php",
"diff": "@@ -9,6 +9,9 @@ use Symfony\\Component\\HttpFoundation\\Response;\nuse Symfony\\Component\\Routing\\Annotation\\Route;\nuse Symfony\\Component\\Security\\Http\\Authentication\\AuthenticationUtils;\n+/**\n+ * Class AuthenticationController.\n+ */\nclass AuthenticationController extends BaseController\n{\n/**\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/ContentEditController.php",
"new_path": "src/Controller/Backend/ContentEditController.php",
"diff": "@@ -19,7 +19,7 @@ use Symfony\\Component\\Security\\Core\\Exception\\InvalidCsrfTokenException;\nuse Symfony\\Component\\Security\\Csrf\\CsrfToken;\n/**\n- * Class EditRecordController.\n+ * Class ContentEditController.\n*\n* @Security(\"has_role('ROLE_ADMIN')\")\n*/\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/ContentOverviewController.php",
"new_path": "src/Controller/Backend/ContentOverviewController.php",
"diff": "@@ -13,7 +13,7 @@ use Symfony\\Component\\HttpFoundation\\Response;\nuse Symfony\\Component\\Routing\\Annotation\\Route;\n/**\n- * Class ContentListingController.\n+ * Class ContentOverviewController.\n*\n* @Security(\"has_role('ROLE_ADMIN')\")\n*/\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/DashboardController.php",
"new_path": "src/Controller/Backend/DashboardController.php",
"diff": "@@ -12,6 +12,8 @@ use Symfony\\Component\\HttpFoundation\\Response;\nuse Symfony\\Component\\Routing\\Annotation\\Route;\n/**\n+ * Class DashboardController.\n+ *\n* @Security(\"has_role('ROLE_ADMIN')\")\n*/\nclass DashboardController extends BaseController\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/DatabaseIntegrityController.php",
"new_path": "src/Controller/Backend/DatabaseIntegrityController.php",
"diff": "@@ -8,6 +8,11 @@ use Bolt\\Controller\\BaseController;\nuse Symfony\\Component\\HttpFoundation\\Response;\nuse Symfony\\Component\\Routing\\Annotation\\Route;\n+/**\n+ * Class DatabaseIntegrityController.\n+ *\n+ * @Security(\"has_role('ROLE_ADMIN')\")\n+ */\nclass DatabaseIntegrityController extends BaseController\n{\n/**\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/FileEditController.php",
"new_path": "src/Controller/Backend/FileEditController.php",
"diff": "@@ -18,7 +18,7 @@ use Symfony\\Component\\Yaml\\Parser;\nuse Webmozart\\PathUtil\\Path;\n/**\n- * Class EditFileController.\n+ * Class FileEditController.\n*\n* @Security(\"has_role('ROLE_ADMIN')\")\n*/\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/FixturesController.php",
"new_path": "src/Controller/Backend/FixturesController.php",
"diff": "@@ -8,6 +8,11 @@ use Bolt\\Controller\\BaseController;\nuse Symfony\\Component\\HttpFoundation\\Response;\nuse Symfony\\Component\\Routing\\Annotation\\Route;\n+/**\n+ * Class FixturesController.\n+ *\n+ * @Security(\"has_role('ROLE_ADMIN')\")\n+ */\nclass FixturesController extends BaseController\n{\n/**\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/GeneralController.php",
"new_path": "src/Controller/Backend/GeneralController.php",
"diff": "@@ -8,6 +8,11 @@ use Bolt\\Controller\\BaseController;\nuse Symfony\\Component\\HttpFoundation\\Response;\nuse Symfony\\Component\\Routing\\Annotation\\Route;\n+/**\n+ * Class GeneralController.\n+ *\n+ * @Security(\"has_role('ROLE_ADMIN')\")\n+ */\nclass GeneralController extends BaseController\n{\n/**\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/OmnisearchController.php",
"new_path": "src/Controller/Backend/OmnisearchController.php",
"diff": "@@ -8,6 +8,11 @@ use Bolt\\Controller\\BaseController;\nuse Symfony\\Component\\HttpFoundation\\Response;\nuse Symfony\\Component\\Routing\\Annotation\\Route;\n+/**\n+ * Class OmnisearchController.\n+ *\n+ * @Security(\"has_role('ROLE_ADMIN')\")\n+ */\nclass OmnisearchController extends BaseController\n{\n/**\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/ProfileController.php",
"new_path": "src/Controller/Backend/ProfileController.php",
"diff": "@@ -15,7 +15,7 @@ use Symfony\\Component\\Routing\\Generator\\UrlGeneratorInterface;\nuse Symfony\\Component\\Security\\Core\\Encoder\\UserPasswordEncoderInterface;\n/**\n- * Class UserController.\n+ * Class ProfileController.\n*\n* @Security(\"has_role('ROLE_ADMIN')\")\n*/\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/ResetPasswordController.php",
"new_path": "src/Controller/Backend/ResetPasswordController.php",
"diff": "@@ -8,6 +8,11 @@ use Bolt\\Controller\\BaseController;\nuse Symfony\\Component\\HttpFoundation\\Response;\nuse Symfony\\Component\\Routing\\Annotation\\Route;\n+/**\n+ * Class ResetPasswordController.\n+ *\n+ * @Security(\"has_role('ROLE_ADMIN')\")\n+ */\nclass ResetPasswordController extends BaseController\n{\n/**\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Tweaking PHPDOC for backend controllers
|
95,112 |
19.11.2018 00:20:22
| -3,600 |
f6a65405565fd04e502ffa8b222030dba4c10817
|
add new commands to Makefile
|
[
{
"change_type": "MODIFY",
"old_path": "Makefile",
"new_path": "Makefile",
"diff": "+install:\n+ composer install\n+ npm install\n+ npm run build\n+\n+start:\n+ make install\n+ make db-create\n+ make server\n+\n+server:\n+ bin/console server:start\n+\ncsclear:\nmkdir -p var/cache/ecs\nchmod -R a+rw var/cache/ecs\n@@ -15,3 +28,13 @@ csfix:\nstancheck:\nvendor/bin/phpstan analyse -c phpstan.neon src\n+\n+db-create:\n+ bin/console doctrine:database:create\n+ bin/console doctrine:schema:create\n+ bin/console doctrine:fixtures:load -n\n+\n+db-reset:\n+ bin/console doctrine:schema:drop --force\n+ bin/console doctrine:schema:create\n+ bin/console doctrine:fixtures:load -n\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
add new commands to Makefile
|
95,180 |
19.11.2018 12:37:13
| -3,600 |
faa6402ef924b66b3ea17c3d8fb7abd773b7d808
|
switched out flagkit-web for flagpack
|
[
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/General/Language/Language.vue",
"new_path": "assets/js/app/editor/Components/General/Language/Language.vue",
"diff": ">\n<template slot=\"singleLabel\" slot-scope=\"props\">\n<span\n- class=\"flag mr-1\"\n- :class=\"props.option.flag|uppercase\"\n+ class=\"fp mr-1\"\n+ :class=\"props.option.flag\"\n></span>\n<span>{{props.option.localisedname}}</span>\n</template>\n<template slot=\"option\" slot-scope=\"props\">\n<span\n- class=\"flag mr-1\"\n- :class=\"props.option.flag|uppercase\"\n+ class=\"fp mr-1\"\n+ :class=\"props.option.flag\"\n></span>\n<span>{{props.option.localisedname}}</span>\n</template>\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/scss/vendor/flagkit/flagkit.scss",
"new_path": "assets/scss/vendor/flagkit/flagkit.scss",
"diff": "-$FLAGKIT_FOLDER_PATH: '/assets/icons/flags/';\n+$fp-path: '/assets/icons/flags/';\n-@import 'flagkit-web/styles/flagkit.scss';\n+@import 'flagpack/src/flagpack.scss';\n.flag{\nbackground-size: contain;\n@@ -12,3 +12,5 @@ $FLAGKIT_FOLDER_PATH: '/assets/icons/flags/';\nvertical-align: sub;\nline-height: 1em;\n}\n+\n+\n"
},
{
"change_type": "MODIFY",
"old_path": "config/bolt/config.yaml",
"new_path": "config/bolt/config.yaml",
"diff": "@@ -320,7 +320,7 @@ wysiwyg:\n# requires that it be loaded with an API key on new domains. You can generate\n# a key at https://developers.google.com/maps/documentation/javascript/get-api-key\n# and enter it here to make sure that the geolocation field works.\n-# google_api_key:\n+google_api_key: AIzaSyAlOkV-3v-JpkVJ8h_e78eTxyBUCbn6p5g\n# Global option to enable/disable the live editor\nliveeditor: false\n"
},
{
"change_type": "MODIFY",
"old_path": "config/bolt/contenttypes.yaml",
"new_path": "config/bolt/contenttypes.yaml",
"diff": "@@ -199,13 +199,9 @@ showcases:\ngroup: other\ndatetime:\ntype: date\n- default: \"2000-01-01\"\n- variant: inline\nmode: datetime\ndate:\ntype: date\n- default: \"first day of last month\"\n- variant: inline\nintegerfield:\ntype: number\nmode: integer\n"
},
{
"change_type": "MODIFY",
"old_path": "package-lock.json",
"new_path": "package-lock.json",
"diff": "},\n\"clean-webpack-plugin\": {\n\"version\": \"0.1.19\",\n- \"resolved\": \"http://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-0.1.19.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-0.1.19.tgz\",\n\"integrity\": \"sha512-M1Li5yLHECcN2MahoreuODul5LkjohJGFxLPTjl3j1ttKrF5rgjZET1SJduuqxLAuT1gAPOdkhg03qcaaU1KeA==\",\n\"dev\": true,\n\"requires\": {\n},\n\"colors\": {\n\"version\": \"1.1.2\",\n- \"resolved\": \"http://registry.npmjs.org/colors/-/colors-1.1.2.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/colors/-/colors-1.1.2.tgz\",\n\"integrity\": \"sha1-FopHAXVran9RoSzgyXv6KMCE7WM=\",\n\"dev\": true\n},\n\"resolved\": \"https://registry.npmjs.org/flagkit-web/-/flagkit-web-0.0.3.tgz\",\n\"integrity\": \"sha512-4Vec1j+Op/z/ICdphePatzg97IVkPoG9ne+NE+0zRk9kfY9iA3XUtCVXYAQMD/cCbxKck55/smLvPO+cpKFvkQ==\"\n},\n+ \"flagpack\": {\n+ \"version\": \"0.5.1\",\n+ \"resolved\": \"https://registry.npmjs.org/flagpack/-/flagpack-0.5.1.tgz\",\n+ \"integrity\": \"sha512-QyUm9jVM5jSe6dmKZFrePajJo7qtfxtykG9G77LDYxHr2GQpPYIrCvjTxcwnIZUpZeQP9akFFZrXj0TfXAAiyQ==\"\n+ },\n\"flat-cache\": {\n\"version\": \"1.3.4\",\n\"resolved\": \"https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz\",\n},\n\"globby\": {\n\"version\": \"6.1.0\",\n- \"resolved\": \"http://registry.npmjs.org/globby/-/globby-6.1.0.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/globby/-/globby-6.1.0.tgz\",\n\"integrity\": \"sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=\",\n\"dev\": true,\n\"requires\": {\n},\n\"handle-thing\": {\n\"version\": \"1.2.5\",\n- \"resolved\": \"http://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz\",\n\"integrity\": \"sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ=\",\n\"dev\": true\n},\n},\n\"safe-regex\": {\n\"version\": \"1.1.0\",\n- \"resolved\": \"https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz\",\n+ \"resolved\": \"http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz\",\n\"integrity\": \"sha1-QKNmnzsHfR6UPURinhV91IAjvy4=\",\n\"dev\": true,\n\"requires\": {\n},\n\"strip-eof\": {\n\"version\": \"1.0.0\",\n- \"resolved\": \"https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz\",\n+ \"resolved\": \"http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz\",\n\"integrity\": \"sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=\",\n\"dev\": true\n},\n"
},
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"baguettebox.js\": \"^1.11.0\",\n\"bootstrap\": \"^4.1.3\",\n\"codemirror\": \"^5.41.0\",\n- \"flagkit-web\": \"0.0.3\",\n+ \"flagpack\": \"^0.5.1\",\n\"jquery\": \"^3.3.1\",\n\"moment\": \"^2.22.2\",\n\"no-scroll\": \"^2.1.1\",\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/geolocation.html.twig",
"new_path": "templates/_partials/fields/geolocation.html.twig",
"diff": "{% extends '@bolt/_partials/fields/_base.html.twig' %}\n{% block field %}\n- <input name=\"{{ name }}\" placeholder=\"First Name\" type=\"text\" value=\"{{ value }}\" class=\"form-control {{ class }}\" {{ attributes|default()|raw }}>\n+ {% if config is defined %}\n+ {% set apikey = config.get('general/google_api_key')|default(null) %}\n+ {% endif %}\n+\n+ {% if apikey != null %}\n+ {{ apikey }}\n+ {% else %}\n+ null\n+ {% endif %}\n- (Small map, lat and long go here, somewhere)\n{% endblock %}\n"
},
{
"change_type": "MODIFY",
"old_path": "webpack.config.js",
"new_path": "webpack.config.js",
"diff": "@@ -21,7 +21,7 @@ Encore\nfrom: './assets/static'\n})\n.copyFiles({\n- from: './node_modules/flagkit-web/svgs',\n+ from: './node_modules/flagpack/flags',\nto: 'icons/flags/[name].[ext]',\npattern: /\\.(svg)$/\n})\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
switched out flagkit-web for flagpack
|
95,112 |
19.11.2018 17:24:42
| -3,600 |
853d86ba5f3de3c3fc8a7d3a934edfcb74a7a7d6
|
Travis config updated, ECS config fine-tuned, some CS fixes applied
|
[
{
"change_type": "MODIFY",
"old_path": ".travis.yml",
"new_path": ".travis.yml",
"diff": "@@ -31,8 +31,10 @@ install:\nscript:\n- ./bin/phpunit\n- # this checks that the source code follows the Symfony Code Syntax rules\n- - '[[ \"$TRAVIS_PHP_VERSION\" == \"nightly\" ]] || ./vendor/bin/php-cs-fixer fix --diff --dry-run -v'\n+ # this checks that the source code follows the Bolt Code Syntax rules\n+ - ./vendor/bin/ecs check src\n+ - ./vendor/bin/phpstan analyse -c phpstan.neon src\n+ #- '[[ \"$TRAVIS_PHP_VERSION\" == \"nightly\" ]] || ./vendor/bin/php-cs-fixer fix --diff --dry-run -v'\n# this checks that the YAML config files contain no syntax errors\n- ./bin/console lint:yaml config\n# this checks that the Twig template files contain no syntax errors\n"
},
{
"change_type": "MODIFY",
"old_path": "easy-coding-standard.yml",
"new_path": "easy-coding-standard.yml",
"diff": "@@ -102,8 +102,6 @@ parameters:\n- 'PhpCsFixer\\Fixer\\Operator\\UnaryOperatorSpacesFixer'\n- 'PhpCsFixer\\Fixer\\Phpdoc\\PhpdocAnnotationWithoutDotFixer'\n- 'PhpCsFixer\\Fixer\\Phpdoc\\PhpdocSummaryFixer'\n- - 'PhpCsFixer\\Fixer\\ReturnNotation\\ReturnAssignmentFixer'\n- 'PhpCsFixer\\Fixer\\Whitespace\\BlankLineBeforeStatementFixer'\n- 'SlevomatCodingStandard\\Sniffs\\TypeHints\\TypeHintDeclarationSniff'\n- - 'SlevomatCodingStandard\\Sniffs\\Variables\\UselessVariableSniff'\n- 'Symplify\\CodingStandard\\Sniffs\\Debug\\CommentedOutCodeSniff' #to be removed after beta release\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Configuration/Parser/GeneralParser.php",
"new_path": "src/Configuration/Parser/GeneralParser.php",
"diff": "@@ -259,9 +259,7 @@ class GeneralParser extends BaseParser\n'servicename', 'service', 'pooled', 'instancename', 'server', // Oracle\n'persistent', // SQL Anywhere\n];\n- $params = $params->intersectByKeys($validKeys);\n-\n- return $params;\n+ return $params->intersectByKeys($validKeys);\n}\n/**\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Configuration/PathResolver.php",
"new_path": "src/Configuration/PathResolver.php",
"diff": "@@ -136,9 +136,7 @@ class PathResolver\n}\n// Make sure we don't have lingering unneeded dir-seperators\n- $path = Path::canonicalize($path);\n-\n- return $path;\n+ return Path::canonicalize($path);\n}\n/**\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Content/FieldType.php",
"new_path": "src/Content/FieldType.php",
"diff": "@@ -18,7 +18,7 @@ final class FieldType extends Collection\n*/\nprivate function defaults()\n{\n- $values = [\n+ return [\n'type' => '',\n'class' => '',\n'group' => '',\n@@ -31,8 +31,6 @@ final class FieldType extends Collection\n'default' => '',\n'allowtwig' => false,\n];\n-\n- return $values;\n}\n/**\n@@ -62,8 +60,6 @@ final class FieldType extends Collection\n{\n$definition['name'] = $name;\n- $field = new self($definition);\n-\n- return $field;\n+ return new self($definition);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Content/MediaFactory.php",
"new_path": "src/Content/MediaFactory.php",
"diff": "@@ -6,6 +6,7 @@ namespace Bolt\\Content;\nuse Bolt\\Configuration\\Config;\nuse Bolt\\Entity\\Media;\n+use Bolt\\Entity\\User;\nuse Bolt\\Repository\\MediaRepository;\nuse Carbon\\Carbon;\nuse Faker\\Factory;\n@@ -14,7 +15,6 @@ use PHPExif\\Reader\\Reader;\nuse Symfony\\Component\\DependencyInjection\\ContainerInterface;\nuse Symfony\\Component\\Finder\\SplFileInfo;\nuse Tightenco\\Collect\\Support\\Collection;\n-use Webmozart\\PathUtil\\Path;\nclass MediaFactory\n{\n@@ -38,10 +38,6 @@ class MediaFactory\n/**\n* MediaFactory constructor.\n- *\n- * @param Config $config\n- * @param MediaRepository $mediaRepository\n- * @param ContainerInterface $container\n*/\npublic function __construct(Config $config, MediaRepository $mediaRepository, ContainerInterface $container)\n{\n@@ -54,18 +50,13 @@ class MediaFactory\n$this->mediatypes = $config->getMediaTypes();\n}\n- /**\n- * @param SplFileInfo $file\n- * @param string $area\n- *\n- * @return Media\n- */\npublic function createOrUpdateMedia(SplFileInfo $file, string $area): Media\n{\n$media = $this->mediaRepository->findOneBy([\n'area' => $area,\n'path' => $file->getRelativePath(),\n- 'filename' => $file->getFilename(), ]);\n+ 'filename' => $file->getFilename(),\n+ ]);\nif (! $media) {\n$media = new Media();\n@@ -88,13 +79,8 @@ class MediaFactory\nreturn $media;\n}\n- /**\n- * @param Media $media\n- * @param $file\n- */\n- private function updateImageData(Media $media, $file)\n+ private function updateImageData(Media $media, $file): void\n{\n- /** @var Exif $exif */\n$exif = $this->exif->read($file->getRealPath());\nif ($exif) {\n@@ -114,51 +100,35 @@ class MediaFactory\n}\n}\n- /**\n- * @param $media\n- *\n- * @return bool\n- */\n- private function isImage($media)\n+ private function isImage(Media $media): bool\n{\nreturn in_array($media->getType(), ['gif', 'png', 'jpg', 'svg'], true);\n}\n- /**\n- * @return object|string|void\n- */\n- protected function getUser()\n+ protected function getUser(): ?User\n{\nif (! $this->container->has('security.token_storage')) {\nthrow new \\LogicException('The SecurityBundle is not registered in your application. Try running \"composer require symfony/security-bundle\".');\n}\n- if (null === $token = $this->container->get('security.token_storage')->getToken()) {\n- return;\n+ $token = $this->container->get('security.token_storage')->getToken();\n+ if ($token === null) {\n+ return null;\n}\n- if (!\\is_object($user = $token->getUser())) {\n+ if (! is_object($user = $token->getUser())) {\n// e.g. anonymous authentication\n- return;\n+ return null;\n}\nreturn $user;\n}\n- /**\n- * @param $area\n- * @param $path\n- * @param $filename\n- *\n- * @return Media\n- */\npublic function createFromFilename($area, $path, $filename): Media\n{\n$target = $this->config->getPath($area, true, [$path, $filename]);\n$file = new SplFileInfo($target, $path, $filename);\n- $media = $this->createOrUpdateMedia($file, $area);\n-\n- return $media;\n+ return $this->createOrUpdateMedia($file, $area);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Async/News.php",
"new_path": "src/Controller/Async/News.php",
"diff": "@@ -51,9 +51,7 @@ final class News\n'disable' => false, // $this->getOption('general/backend/news/disable'),\n];\n- $response = new JsonResponse($context, 200);\n-\n- return $response;\n+ return new JsonResponse($context, 200);\n}\n/**\n@@ -76,11 +74,7 @@ final class News\n// }\n// If not cached, get fresh news.\n- $news = $this->fetchNews($hostname);\n-\n-// $this->app['cache']->save('dashboardnews', $news, 7200);\n-\n- return $news;\n+ return $this->fetchNews($hostname);\n}\n/**\n@@ -168,7 +162,7 @@ final class News\n{\n// $driver = $this->app['db']->getDatabasePlatform()->getName();\n- $options = [\n+ return [\n'query' => [\n'v' => Version::VERSION,\n'p' => PHP_VERSION,\n@@ -178,16 +172,5 @@ final class News\n'connect_timeout' => 5,\n'timeout' => 10,\n];\n-\n-// if ($this->getOption('general/httpProxy')) {\n-// $options['proxy'] = sprintf(\n-// '%s:%s@%s',\n-// $this->getOption('general/httpProxy/user'),\n-// $this->getOption('general/httpProxy/password'),\n-// $this->getOption('general/httpProxy/host')\n-// );\n-// }\n-\n- return $options;\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/ContentOverviewController.php",
"new_path": "src/Controller/Backend/ContentOverviewController.php",
"diff": "@@ -38,7 +38,7 @@ class ContentOverviewController extends BaseController\n$page = (int) $request->query->get('page', 1);\n- $records = $content->findAll($page, $contenttype);\n+ $records = $content->findForPage($page, $contenttype);\nreturn $this->renderTemplate('content/listing.html.twig', [\n'records' => $records,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Frontend/ListingController.php",
"new_path": "src/Controller/Frontend/ListingController.php",
"diff": "@@ -44,8 +44,8 @@ class ListingController extends BaseController\n{\n$page = (int) $request->query->get('page', 1);\n- /** @var Content $records */\n- $records = $content->findAll($page);\n+ /** @var Content[] $records */\n+ $records = $content->findForPage($page);\n$contenttype = ContentType::factory($contenttypeslug, $this->config->get('contenttypes'));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Frontend/SearchController.php",
"new_path": "src/Controller/Frontend/SearchController.php",
"diff": "@@ -40,8 +40,8 @@ class SearchController extends BaseController\n{\n$page = (int) $request->query->get('page', 1);\n- /** @var Content $records */\n- $records = $content->findAll($page);\n+ /** @var Content[] $records */\n+ $records = $content->findForPage($page);\n$contenttype = ContentType::factory('page', $this->config->get('contenttypes'));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Frontend/TaxonomyController.php",
"new_path": "src/Controller/Frontend/TaxonomyController.php",
"diff": "@@ -37,8 +37,8 @@ class TaxonomyController extends BaseController\n{\n$page = (int) $request->query->get('page', 1);\n- /** @var Content $records */\n- $records = $content->findAll($page);\n+ /** @var Content[] $records */\n+ $records = $content->findForPage($page);\n$contenttype = ContentType::factory('page', $this->config->get('contenttypes'));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Entity/Content.php",
"new_path": "src/Entity/Content.php",
"diff": "@@ -36,9 +36,9 @@ class Content\n{\nuse ContentMagicTraits;\n- public const NUM_ITEMS = 8;\n+ public const NUM_ITEMS = 8; // @todo this can't be a const\n- public const STATUSES = ['published', 'held', 'timed', 'draft'];\n+ public const STATUSES = ['published', 'held', 'timed', 'draft']; // @todo move to Enum\n/**\n* @ORM\\Id()\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Repository/ContentRepository.php",
"new_path": "src/Repository/ContentRepository.php",
"diff": "@@ -8,6 +8,7 @@ use Bolt\\Content\\ContentType;\nuse Bolt\\Entity\\Content;\nuse Doctrine\\Bundle\\DoctrineBundle\\Repository\\ServiceEntityRepository;\nuse Doctrine\\ORM\\Query;\n+use Doctrine\\ORM\\QueryBuilder;\nuse Pagerfanta\\Adapter\\DoctrineORMAdapter;\nuse Pagerfanta\\Pagerfanta;\nuse Symfony\\Bridge\\Doctrine\\RegistryInterface;\n@@ -25,12 +26,12 @@ class ContentRepository extends ServiceEntityRepository\nparent::__construct($registry, Content::class);\n}\n- private function getQueryBuilder(QueryBuilder $qb = null)\n+ private function getQueryBuilder(): QueryBuilder\n{\n- return $qb ?: $this->createQueryBuilder('content');\n+ return $this->createQueryBuilder('content');\n}\n- public function findAll(int $page = 1, ContentType $contenttype = null): Pagerfanta\n+ public function findForPage(int $page = 1, ?ContentType $contenttype = null): Pagerfanta\n{\n$qb = $this->getQueryBuilder()\n->addSelect('a')\n@@ -44,7 +45,7 @@ class ContentRepository extends ServiceEntityRepository\nreturn $this->createPaginator($qb->getQuery(), $page);\n}\n- public function findLatest(ContentType $contenttype = null, $amount = 6): ?array\n+ public function findLatest(?ContentType $contenttype = null, int $amount = 6): ?array\n{\n$qb = $this->getQueryBuilder()\n->addSelect('a')\n@@ -61,15 +62,14 @@ class ContentRepository extends ServiceEntityRepository\nreturn array_slice($result, 0, $amount);\n}\n- public function findOneBySlug(string $slug)\n+ public function findOneBySlug(string $slug): ?Content\n{\nreturn $this->getQueryBuilder()\n- ->innerJoin('Bolt\\Entity\\Field\\SlugField', 'field')\n+ ->innerJoin(\\Bolt\\Entity\\Field\\SlugField::class, 'field')\n->andWhere('field.value = :slug')\n->setParameter('slug', json_encode([$slug]))\n->getQuery()\n- ->getResult()\n- ;\n+ ->getOneOrNullResult();\n// ->join('m.PropertyEntity', 'p')\n// ->where('p.value IN (:values)')\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Travis config updated, ECS config fine-tuned, some CS fixes applied
|
95,168 |
19.11.2018 17:27:36
| -3,600 |
f995458b66501120aa03affdd99287e8e88dac51
|
Add Email field and update component names
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "assets/js/Components/Email/Email.vue",
"diff": "+<template>\n+ <div>\n+ <input\n+ type=\"email\"\n+ :id=\"id\"\n+ :name=\"name\"\n+ :value=\"value\"\n+ class=\"form-control\"\n+ />\n+ </div>\n+</template>\n+\n+<script>\n+export default {\n+ name: \"field-email\",\n+ props: [\"value\", \"name\", \"id\"]\n+};\n+</script>\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/js/Components/Password/Password.vue",
"new_path": "assets/js/Components/Password/Password.vue",
"diff": ":name=\"name\"\n:value=\"value\"\nclass=\"form-control\"\n+ autocomplete=\"new-password\"\n/>\n<i class=\"input-group-text fas fa-eye\"></i>\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/js/Views/user.js",
"new_path": "assets/js/Views/user.js",
"diff": "@@ -4,12 +4,15 @@ import Vue from \"vue\";\n*/\nimport Theme from \"../Components/User/Theme\";\nimport Password from \"../Components/Password/Password\";\n+import Email from \"../Components/Email/Email\";\n/**\n* Register Components\n*/\nVue.component(\"user-theme\", Theme);\nVue.component(\"field-password\", Password);\n+Vue.component(\"field-email\", Email);\nnew Vue({ el: \"#user\", name: \"user\" });\n-new Vue({ el: \"#field-password\", name: \"field-password\" });\n+new Vue({ el: \"#user-password\", name: \"field-password\" });\n+new Vue({ el: \"#user-email\", name: \"field-password\" });\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/email.html.twig",
"new_path": "templates/_partials/fields/email.html.twig",
"diff": "{% extends '@bolt/_partials/fields/_base.html.twig' %}\n{% block field %}\n- <input type=\"email\" id=\"{{ id }}\" name=\"{{ name }}\" value=\"{{ value }}\" class=\"{{ class }}\">\n+ <div id=\"user-email\">\n+ <field-email\n+ :id=\"'{{ id }}'\"\n+ :name=\"'{{ name }}'\"\n+ :value=\"{{ value|json_encode() }}\"\n+ ></field-email>\n+ </div>\n{% endblock %}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/password.html.twig",
"new_path": "templates/_partials/fields/password.html.twig",
"diff": "{% extends '@bolt/_partials/fields/_base.html.twig' %}\n{% block field %}\n+ <div id=\"user-password\">\n<field-password\n:id=\"'{{ id }}'\"\n:name=\"'{{ name }}'\"\n- :value=\"'{{ value }}'\"\n+ :value=\"{{ value|json_encode() }}\"\n></field-password>\n+ </div>\n{% endblock %}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/users/edit.html.twig",
"new_path": "templates/users/edit.html.twig",
"diff": "'disabled' : false,\n} %}\n- <div id=\"field-password\">\n{% include '@bolt/_partials/fields/password.html.twig' with {\n'label': 'label.password'|trans,\n'label_class': 'required',\n'value': '',\n'class': 'form-control',\n} %}\n- </div>\n{% include '@bolt/_partials/fields/email.html.twig' with {\n'label': 'label.email'|trans,\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Add Email field and update component names
|
95,112 |
19.11.2018 17:27:57
| -3,600 |
2629865441f77f7bfcfb277addf3a4b8087855c0
|
another CS fixes, still 38 errors to be fixed manually
|
[
{
"change_type": "MODIFY",
"old_path": "src/Entity/Content.php",
"new_path": "src/Entity/Content.php",
"diff": "@@ -172,7 +172,7 @@ class Content\npublic function getSummary(): array\n{\n- $summary = [\n+ return [\n'id' => $this->getid(),\n'contenttype' => $this->getDefinition()->get('slug'),\n'slug' => $this->getSlug(),\n@@ -195,8 +195,6 @@ class Content\n'publishedAt' => $this->getPublishedAt(),\n'depublishedAt' => $this->depublishedAt(),\n];\n-\n- return $summary;\n}\npublic function getSlug(): string\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Entity/ContentMagicTraits.php",
"new_path": "src/Entity/ContentMagicTraits.php",
"diff": "@@ -57,16 +57,12 @@ trait ContentMagicTraits\npublic function magicLink()\n{\n- $path = $this->urlGenerator->generate('record', ['slug' => $this->getSlug()]);\n-\n- return $path;\n+ return $this->urlGenerator->generate('record', ['slug' => $this->getSlug()]);\n}\npublic function magicEditLink()\n{\n- $path = $this->urlGenerator->generate('bolt_content_edit', ['id' => $this->getId()]);\n-\n- return $path;\n+ return $this->urlGenerator->generate('bolt_content_edit', ['id' => $this->getId()]);\n}\npublic function magicTitleFields(): array\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Entity/Field/ImageField.php",
"new_path": "src/Entity/Field/ImageField.php",
"diff": "@@ -17,9 +17,7 @@ class ImageField extends Field\n{\n$config = $this->getContent()->getConfig();\n- $path = $config->getPath('files', false, $this->get('filename'));\n-\n- return $path;\n+ return $config->getPath('files', false, $this->get('filename'));\n}\npublic function getValue(): ?array\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Helpers/Excerpt.php",
"new_path": "src/Helpers/Excerpt.php",
"diff": "@@ -124,9 +124,7 @@ class Excerpt\n}\n}\n- $startPos = $startPos > $prevCount ? $startPos - $prevCount : 0;\n-\n- return $startPos;\n+ return $startPos > $prevCount ? $startPos - $prevCount : 0;\n}\n/**\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Helpers/Html.php",
"new_path": "src/Helpers/Html.php",
"diff": "@@ -58,9 +58,7 @@ class Html\npublic static function decorateTT($str): string\n{\n$str = htmlspecialchars($str, ENT_QUOTES);\n- $str = preg_replace('/`([^`]*)`/', '<tt>\\\\1</tt>', $str);\n-\n- return $str;\n+ return preg_replace('/`([^`]*)`/', '<tt>\\\\1</tt>', $str);\n}\n/**\n@@ -90,9 +88,7 @@ class Html\n*/\npublic static function addScheme($url, $scheme = 'http://'): string\n{\n- $url = parse_url($url, PHP_URL_SCHEME) === null ? $scheme . $url : $url;\n-\n- return $url;\n+ return parse_url($url, PHP_URL_SCHEME) === null ? $scheme . $url : $url;\n}\n/**\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Repository/ContentRepository.php",
"new_path": "src/Repository/ContentRepository.php",
"diff": "@@ -14,8 +14,8 @@ use Pagerfanta\\Pagerfanta;\nuse Symfony\\Bridge\\Doctrine\\RegistryInterface;\n/**\n- * @method Content|null find($id, $lockMode = null, $lockVersion = null)\n- * @method Content|null findOneBy(array $criteria, array $orderBy = null)\n+ * @method (Content | null) find($id, $lockMode = null, $lockVersion=null)\n+ * @method (Content | null) findOneBy(array $criteria, array $orderBy=null)\n* @method Content[] findAll()\n* @method Content[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)\n*/\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/AdminExtension.php",
"new_path": "src/Twig/AdminExtension.php",
"diff": "@@ -61,9 +61,7 @@ class AdminExtension extends AbstractExtension\n'area' => 'config',\n'file' => '/' . $matches[1],\n]);\n- $link = sprintf(' <a href=\"%s\">%s</a>', $path, $matches[1]);\n-\n- return $link;\n+ return sprintf(' <a href=\"%s\">%s</a>', $path, $matches[1]);\n},\n$str\n);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/ImageExtension.php",
"new_path": "src/Twig/ImageExtension.php",
"diff": "@@ -76,9 +76,7 @@ class ImageExtension extends AbstractExtension\n$urlBuilder = UrlBuilderFactory::create('/thumbs/', $secret);\n// Generate a URL\n- $url = $urlBuilder->getUrl($filename, $params);\n-\n- return $url;\n+ return $urlBuilder->getUrl($filename, $params);\n}\npublic function dummy($input = null)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/LocaleExtension.php",
"new_path": "src/Twig/LocaleExtension.php",
"diff": "@@ -51,9 +51,7 @@ class LocaleExtension extends AbstractExtension\npublic function getLocale($localeCode)\n{\n- $locale = $this->localeInfo($localeCode);\n-\n- return $locale;\n+ return $this->localeInfo($localeCode);\n}\n/**\n@@ -104,14 +102,12 @@ class LocaleExtension extends AbstractExtension\n$localeCode = mb_strtolower($splitCode[0]);\n}\n- $locale = collect([\n+ return collect([\n'code' => $localeCode,\n'name' => Intl::getLocaleBundle()->getLocaleName($localeCode),\n'localisedname' => Intl::getLocaleBundle()->getLocaleName($localeCode, $localeCode),\n'flag' => $this->getFlagTag($localeCode),\n]);\n-\n- return $locale;\n}\nprivate function getFlagTag($localeCode)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Utils/Markdown.php",
"new_path": "src/Utils/Markdown.php",
"diff": "@@ -30,8 +30,6 @@ class Markdown\npublic function toHtml(string $text): string\n{\n$html = $this->parser->text($text);\n- $safeHtml = $this->purifier->purify($html);\n-\n- return $safeHtml;\n+ return $this->purifier->purify($html);\n}\n}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
another CS fixes, still 38 errors to be fixed manually
|
95,112 |
19.11.2018 18:11:17
| -3,600 |
60154487bf11b43a5c342b61b754811122952911
|
fix doctrine deprecated class
|
[
{
"change_type": "MODIFY",
"old_path": "composer.json",
"new_path": "composer.json",
"diff": "\"api-platform/api-pack\": \"^1.1\",\n\"bolt/common\": \"^2.0\",\n\"cocur/slugify\": \"^3.1\",\n+ \"doctrine/common\": \"2.8.1\",\n\"erusev/parsedown\": \"^1.7\",\n\"ezyang/htmlpurifier\": \"^4.10\",\n\"fzaninotto/faker\": \"^1.8\",\n"
},
{
"change_type": "MODIFY",
"old_path": "composer.lock",
"new_path": "composer.lock",
"diff": "\"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file\",\n\"This file is @generated automatically\"\n],\n- \"content-hash\": \"f6df0d47da4000bee3951beed38bb0ac\",\n+ \"content-hash\": \"c7338a1bc99560f5748fec1b86c543f5\",\n\"packages\": [\n{\n\"name\": \"api-platform/api-pack\",\n},\n{\n\"name\": \"doctrine/common\",\n- \"version\": \"v2.9.0\",\n+ \"version\": \"v2.8.1\",\n\"source\": {\n\"type\": \"git\",\n\"url\": \"https://github.com/doctrine/common.git\",\n- \"reference\": \"a210246d286c77d2b89040f8691ba7b3a713d2c1\"\n+ \"reference\": \"f68c297ce6455e8fd794aa8ffaf9fa458f6ade66\"\n},\n\"dist\": {\n\"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/doctrine/common/zipball/a210246d286c77d2b89040f8691ba7b3a713d2c1\",\n- \"reference\": \"a210246d286c77d2b89040f8691ba7b3a713d2c1\",\n+ \"url\": \"https://api.github.com/repos/doctrine/common/zipball/f68c297ce6455e8fd794aa8ffaf9fa458f6ade66\",\n+ \"reference\": \"f68c297ce6455e8fd794aa8ffaf9fa458f6ade66\",\n\"shasum\": \"\"\n},\n\"require\": {\n- \"doctrine/annotations\": \"^1.0\",\n- \"doctrine/cache\": \"^1.0\",\n- \"doctrine/collections\": \"^1.0\",\n- \"doctrine/event-manager\": \"^1.0\",\n- \"doctrine/inflector\": \"^1.0\",\n- \"doctrine/lexer\": \"^1.0\",\n- \"doctrine/persistence\": \"^1.0\",\n- \"doctrine/reflection\": \"^1.0\",\n- \"php\": \"^7.1\"\n+ \"doctrine/annotations\": \"1.*\",\n+ \"doctrine/cache\": \"1.*\",\n+ \"doctrine/collections\": \"1.*\",\n+ \"doctrine/inflector\": \"1.*\",\n+ \"doctrine/lexer\": \"1.*\",\n+ \"php\": \"~7.1\"\n},\n\"require-dev\": {\n- \"doctrine/coding-standard\": \"^1.0\",\n- \"phpunit/phpunit\": \"^6.3\",\n- \"squizlabs/php_codesniffer\": \"^3.0\",\n- \"symfony/phpunit-bridge\": \"^4.0.5\"\n+ \"phpunit/phpunit\": \"^5.7\"\n},\n\"type\": \"library\",\n\"extra\": {\n\"branch-alias\": {\n- \"dev-master\": \"2.9.x-dev\"\n+ \"dev-master\": \"2.8.x-dev\"\n}\n},\n\"autoload\": {\n{\n\"name\": \"Johannes Schmitt\",\n\"email\": \"schmittjoh@gmail.com\"\n- },\n- {\n- \"name\": \"Marco Pivetta\",\n- \"email\": \"ocramius@gmail.com\"\n}\n],\n\"description\": \"Common Library for Doctrine projects\",\n- \"homepage\": \"https://www.doctrine-project.org\",\n+ \"homepage\": \"http://www.doctrine-project.org\",\n\"keywords\": [\n\"annotations\",\n\"collections\",\n\"persistence\",\n\"spl\"\n],\n- \"time\": \"2018-07-12T21:16:12+00:00\"\n+ \"time\": \"2017-08-31T08:43:38+00:00\"\n},\n{\n\"name\": \"doctrine/dbal\",\n- \"version\": \"v2.8.0\",\n+ \"version\": \"v2.7.2\",\n\"source\": {\n\"type\": \"git\",\n\"url\": \"https://github.com/doctrine/dbal.git\",\n- \"reference\": \"5140a64c08b4b607b9bedaae0cedd26f04a0e621\"\n+ \"reference\": \"c0e5736016a51b427a8cba8bc470fbea78165819\"\n},\n\"dist\": {\n\"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/doctrine/dbal/zipball/5140a64c08b4b607b9bedaae0cedd26f04a0e621\",\n- \"reference\": \"5140a64c08b4b607b9bedaae0cedd26f04a0e621\",\n+ \"url\": \"https://api.github.com/repos/doctrine/dbal/zipball/c0e5736016a51b427a8cba8bc470fbea78165819\",\n+ \"reference\": \"c0e5736016a51b427a8cba8bc470fbea78165819\",\n\"shasum\": \"\"\n},\n\"require\": {\n- \"doctrine/cache\": \"^1.0\",\n- \"doctrine/event-manager\": \"^1.0\",\n+ \"doctrine/common\": \"^2.7.1\",\n\"ext-pdo\": \"*\",\n\"php\": \"^7.1\"\n},\n\"require-dev\": {\n\"doctrine/coding-standard\": \"^4.0\",\n- \"jetbrains/phpstorm-stubs\": \"^2018.1.2\",\n- \"phpstan/phpstan\": \"^0.10.1\",\n- \"phpunit/phpunit\": \"^7.1.2\",\n+ \"phpunit/phpunit\": \"^7.0\",\n\"phpunit/phpunit-mock-objects\": \"!=3.2.4,!=3.2.5\",\n- \"symfony/console\": \"^2.0.5|^3.0|^4.0\",\n+ \"symfony/console\": \"^2.0.5||^3.0\",\n\"symfony/phpunit-bridge\": \"^3.4.5|^4.0.5\"\n},\n\"suggest\": {\n\"type\": \"library\",\n\"extra\": {\n\"branch-alias\": {\n- \"dev-master\": \"2.8.x-dev\",\n- \"dev-develop\": \"3.0.x-dev\"\n+ \"dev-master\": \"2.7.x-dev\"\n}\n},\n\"autoload\": {\n\"persistence\",\n\"queryobject\"\n],\n- \"time\": \"2018-07-13T03:16:35+00:00\"\n+ \"time\": \"2018-07-13T04:49:01+00:00\"\n},\n{\n\"name\": \"doctrine/doctrine-bundle\",\n],\n\"time\": \"2017-11-01T09:13:26+00:00\"\n},\n- {\n- \"name\": \"doctrine/event-manager\",\n- \"version\": \"v1.0.0\",\n- \"source\": {\n- \"type\": \"git\",\n- \"url\": \"https://github.com/doctrine/event-manager.git\",\n- \"reference\": \"a520bc093a0170feeb6b14e9d83f3a14452e64b3\"\n- },\n- \"dist\": {\n- \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/doctrine/event-manager/zipball/a520bc093a0170feeb6b14e9d83f3a14452e64b3\",\n- \"reference\": \"a520bc093a0170feeb6b14e9d83f3a14452e64b3\",\n- \"shasum\": \"\"\n- },\n- \"require\": {\n- \"php\": \"^7.1\"\n- },\n- \"conflict\": {\n- \"doctrine/common\": \"<2.9@dev\"\n- },\n- \"require-dev\": {\n- \"doctrine/coding-standard\": \"^4.0\",\n- \"phpunit/phpunit\": \"^7.0\"\n- },\n- \"type\": \"library\",\n- \"extra\": {\n- \"branch-alias\": {\n- \"dev-master\": \"1.0.x-dev\"\n- }\n- },\n- \"autoload\": {\n- \"psr-4\": {\n- \"Doctrine\\\\Common\\\\\": \"lib/Doctrine/Common\"\n- }\n- },\n- \"notification-url\": \"https://packagist.org/downloads/\",\n- \"license\": [\n- \"MIT\"\n- ],\n- \"authors\": [\n- {\n- \"name\": \"Roman Borschel\",\n- \"email\": \"roman@code-factory.org\"\n- },\n- {\n- \"name\": \"Benjamin Eberlei\",\n- \"email\": \"kontakt@beberlei.de\"\n- },\n- {\n- \"name\": \"Guilherme Blanco\",\n- \"email\": \"guilhermeblanco@gmail.com\"\n- },\n- {\n- \"name\": \"Jonathan Wage\",\n- \"email\": \"jonwage@gmail.com\"\n- },\n- {\n- \"name\": \"Johannes Schmitt\",\n- \"email\": \"schmittjoh@gmail.com\"\n- },\n- {\n- \"name\": \"Marco Pivetta\",\n- \"email\": \"ocramius@gmail.com\"\n- }\n- ],\n- \"description\": \"Doctrine Event Manager component\",\n- \"homepage\": \"https://www.doctrine-project.org/projects/event-manager.html\",\n- \"keywords\": [\n- \"event\",\n- \"eventdispatcher\",\n- \"eventmanager\"\n- ],\n- \"time\": \"2018-06-11T11:59:03+00:00\"\n- },\n{\n\"name\": \"doctrine/inflector\",\n\"version\": \"v1.3.0\",\n],\n\"time\": \"2018-07-12T20:47:13+00:00\"\n},\n- {\n- \"name\": \"doctrine/persistence\",\n- \"version\": \"v1.0.1\",\n- \"source\": {\n- \"type\": \"git\",\n- \"url\": \"https://github.com/doctrine/persistence.git\",\n- \"reference\": \"af1ec238659a83e320f03e0e454e200f689b4b97\"\n- },\n- \"dist\": {\n- \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/doctrine/persistence/zipball/af1ec238659a83e320f03e0e454e200f689b4b97\",\n- \"reference\": \"af1ec238659a83e320f03e0e454e200f689b4b97\",\n- \"shasum\": \"\"\n- },\n- \"require\": {\n- \"doctrine/annotations\": \"^1.0\",\n- \"doctrine/cache\": \"^1.0\",\n- \"doctrine/collections\": \"^1.0\",\n- \"doctrine/event-manager\": \"^1.0\",\n- \"doctrine/reflection\": \"^1.0\",\n- \"php\": \"^7.1\"\n- },\n- \"conflict\": {\n- \"doctrine/common\": \"<2.9@dev\"\n- },\n- \"require-dev\": {\n- \"doctrine/coding-standard\": \"^4.0\",\n- \"phpstan/phpstan\": \"^0.8\",\n- \"phpunit/phpunit\": \"^7.0\"\n- },\n- \"type\": \"library\",\n- \"extra\": {\n- \"branch-alias\": {\n- \"dev-master\": \"1.0.x-dev\"\n- }\n- },\n- \"autoload\": {\n- \"psr-4\": {\n- \"Doctrine\\\\Common\\\\\": \"lib/Doctrine/Common\"\n- }\n- },\n- \"notification-url\": \"https://packagist.org/downloads/\",\n- \"license\": [\n- \"MIT\"\n- ],\n- \"authors\": [\n- {\n- \"name\": \"Roman Borschel\",\n- \"email\": \"roman@code-factory.org\"\n- },\n- {\n- \"name\": \"Benjamin Eberlei\",\n- \"email\": \"kontakt@beberlei.de\"\n- },\n- {\n- \"name\": \"Guilherme Blanco\",\n- \"email\": \"guilhermeblanco@gmail.com\"\n- },\n- {\n- \"name\": \"Jonathan Wage\",\n- \"email\": \"jonwage@gmail.com\"\n- },\n- {\n- \"name\": \"Johannes Schmitt\",\n- \"email\": \"schmittjoh@gmail.com\"\n- },\n- {\n- \"name\": \"Marco Pivetta\",\n- \"email\": \"ocramius@gmail.com\"\n- }\n- ],\n- \"description\": \"Doctrine Persistence abstractions.\",\n- \"homepage\": \"https://doctrine-project.org/projects/persistence.html\",\n- \"keywords\": [\n- \"persistence\"\n- ],\n- \"time\": \"2018-07-12T12:37:50+00:00\"\n- },\n- {\n- \"name\": \"doctrine/reflection\",\n- \"version\": \"v1.0.0\",\n- \"source\": {\n- \"type\": \"git\",\n- \"url\": \"https://github.com/doctrine/reflection.git\",\n- \"reference\": \"02538d3f95e88eb397a5f86274deb2c6175c2ab6\"\n- },\n- \"dist\": {\n- \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/doctrine/reflection/zipball/02538d3f95e88eb397a5f86274deb2c6175c2ab6\",\n- \"reference\": \"02538d3f95e88eb397a5f86274deb2c6175c2ab6\",\n- \"shasum\": \"\"\n- },\n- \"require\": {\n- \"doctrine/annotations\": \"^1.0\",\n- \"ext-tokenizer\": \"*\",\n- \"php\": \"^7.1\"\n- },\n- \"require-dev\": {\n- \"doctrine/coding-standard\": \"^4.0\",\n- \"doctrine/common\": \"^2.8\",\n- \"phpstan/phpstan\": \"^0.9.2\",\n- \"phpstan/phpstan-phpunit\": \"^0.9.4\",\n- \"phpunit/phpunit\": \"^7.0\",\n- \"squizlabs/php_codesniffer\": \"^3.0\"\n- },\n- \"type\": \"library\",\n- \"extra\": {\n- \"branch-alias\": {\n- \"dev-master\": \"1.0.x-dev\"\n- }\n- },\n- \"autoload\": {\n- \"psr-4\": {\n- \"Doctrine\\\\Common\\\\\": \"lib/Doctrine/Common\"\n- }\n- },\n- \"notification-url\": \"https://packagist.org/downloads/\",\n- \"license\": [\n- \"MIT\"\n- ],\n- \"authors\": [\n- {\n- \"name\": \"Roman Borschel\",\n- \"email\": \"roman@code-factory.org\"\n- },\n- {\n- \"name\": \"Benjamin Eberlei\",\n- \"email\": \"kontakt@beberlei.de\"\n- },\n- {\n- \"name\": \"Guilherme Blanco\",\n- \"email\": \"guilhermeblanco@gmail.com\"\n- },\n- {\n- \"name\": \"Jonathan Wage\",\n- \"email\": \"jonwage@gmail.com\"\n- },\n- {\n- \"name\": \"Johannes Schmitt\",\n- \"email\": \"schmittjoh@gmail.com\"\n- },\n- {\n- \"name\": \"Marco Pivetta\",\n- \"email\": \"ocramius@gmail.com\"\n- }\n- ],\n- \"description\": \"Doctrine Reflection component\",\n- \"homepage\": \"https://www.doctrine-project.org/projects/reflection.html\",\n- \"keywords\": [\n- \"reflection\"\n- ],\n- \"time\": \"2018-06-14T14:45:07+00:00\"\n- },\n{\n\"name\": \"easycorp/easy-log-handler\",\n\"version\": \"v1.0.7\",\n"
},
{
"change_type": "MODIFY",
"old_path": "symfony.lock",
"new_path": "symfony.lock",
"diff": "\"ref\": \"c1431086fec31f17fbcfe6d6d7e92059458facc1\"\n}\n},\n- \"doctrine/event-manager\": {\n- \"version\": \"v1.0.0\"\n- },\n\"doctrine/inflector\": {\n\"version\": \"v1.2.0\"\n},\n\"doctrine/orm\": {\n\"version\": \"v2.5.12\"\n},\n- \"doctrine/persistence\": {\n- \"version\": \"v1.0.1\"\n- },\n- \"doctrine/reflection\": {\n- \"version\": \"v1.0.0\"\n- },\n\"easycorp/easy-log-handler\": {\n\"version\": \"1.0\",\n\"recipe\": {\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
fix doctrine deprecated class
|
95,144 |
19.11.2018 21:49:16
| -3,600 |
b35f48e8c73bb4399d5fdc1d732b7e4bf9c488ab
|
Working on code quality
|
[
{
"change_type": "MODIFY",
"old_path": "src/Configuration/Config.php",
"new_path": "src/Configuration/Config.php",
"diff": "@@ -8,7 +8,6 @@ use Bolt\\Common\\Arr;\nuse Bolt\\Configuration\\Parser\\ContentTypesParser;\nuse Bolt\\Configuration\\Parser\\GeneralParser;\nuse Bolt\\Configuration\\Parser\\TaxonomyParser;\n-use Symfony\\Component\\Config\\FileLocator;\nuse Tightenco\\Collect\\Support\\Collection;\nclass Config\n@@ -16,9 +15,6 @@ class Config\n/** @var array */\nprotected $data = [];\n- /** @var FileLocator */\n- private $fileLocator;\n-\n/** @var PathResolver */\nprivate $pathResolver;\n@@ -26,23 +22,7 @@ class Config\n{\n$this->pathResolver = new PathResolver(dirname(dirname(__DIR__)), []);\n- $configDirectories = [dirname(dirname(__DIR__)) . '/config/bolt'];\n- $this->fileLocator = new FileLocator($configDirectories);\n-\n- // $this->cacheFile = $this->app['filesystem']->getFile('cache://config-cache.json');\n-\n- $data = null;\n-\n- // $data = $this->loadCache();\n- if ($data === null) {\n- $data = $this->parseConfig();\n-\n- // If we have to reload the config, we will also want to make sure\n- // the DB integrity is checked.\n- // $this->app['schema.timer']->setCheckRequired();\n- }\n-\n- $this->data = $data;\n+ $this->data = $this->parseConfig();\n}\n/**\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Async/Uploader.php",
"new_path": "src/Controller/Async/Uploader.php",
"diff": "@@ -43,8 +43,6 @@ class Uploader\n*/\npublic function upload(Request $request)\n{\n-// $uploadHandler = new Handler('/path/to/local_folder');\n-\n$area = $request->query->get('area', '');\n$path = $request->query->get('path', '');\n"
},
{
"change_type": "DELETE",
"old_path": "src/Media/Item.php",
"new_path": null,
"diff": "-<?php\n-\n-declare(strict_types=1);\n-\n-namespace Bolt\\Media;\n-\n-/**\n- * A wrapper class for easier access to $_FILES object.\n- */\n-class Item\n-{\n- // counter that helps in ensuring each file receives a truly unique id\n- public static $item_counter = 0;\n-\n- // item props\n- private $id;\n- private $file;\n- private $name;\n-\n- public function __construct($file, $id = null)\n- {\n- $this->id = $id ?? md5(uniqid(self::$item_counter++, true));\n- $this->file = $file;\n- $this->name = $file['name'];\n- }\n-\n- public function rename($name, $extension = null): void\n- {\n- $info = pathinfo($this->name);\n- $this->name = $name . '.' . ($extension ?? $info['extension']);\n- }\n-\n- public function getId()\n- {\n- return $this->id;\n- }\n-\n- public function getFilename()\n- {\n- return $this->file['tmp_name'];\n- }\n-\n- public function getName()\n- {\n- return basename($this->name);\n- }\n-\n- public function getNameWithoutExtension()\n- {\n- $info = pathinfo($this->name);\n-\n- return $info['filename'];\n- }\n-\n- public function getExtension()\n- {\n- $info = pathinfo($this->name);\n-\n- return $info['extension'];\n- }\n-\n- public function getSize()\n- {\n- return $this->file['size'];\n- }\n-\n- public function getType()\n- {\n- return $this->file['mime'];\n- }\n-}\n"
},
{
"change_type": "DELETE",
"old_path": "src/Media/RequestHandler.php",
"new_path": null,
"diff": "-<?php\n-\n-declare(strict_types=1);\n-\n-namespace Bolt\\Media;\n-\n-use Bolt\\Configuration\\Config;\n-\n-/**\n- * FilePond RequestHandler helper class.\n- */\n-\n-/*\n-1. get files (from $files and $post)\n-2. store files in tmp/ directory and give them a unique server id\n-3. return server id's to client\n-4. either client reverts upload or finalizes form\n-5. call revert($server_id) to remove file from tmp/ directory\n-6. call save() to save file to final directory\n-*/\n-class RequestHandler\n-{\n- // the default location to save tmp files to\n- private $tmp_dir;\n-\n- // regex to use for testing if a string is a file id\n- private $file_id_format = '/^[0-9a-fA-F]{32}$/';\n-\n- /** @var Config */\n- private $config;\n-\n- public function __construct(Config $config)\n- {\n- $this->config = $config;\n-\n- $this->tmp_dir = $this->config->getPath('cache', true, ['uploads']);\n- }\n-\n- public function isFileId($str): bool\n- {\n- return preg_match($this->file_id_format, $str);\n- }\n-\n- public function isURL($str): bool\n- {\n- return filter_var($str, FILTER_VALIDATE_URL);\n- }\n-\n- /**\n- * Catch all exceptions so we can return a 500 error when the server bugs out.\n- */\n- public function catchExceptions(): void\n- {\n- set_exception_handler('FilePond\\RequestHandler::handleException');\n- }\n-\n- public function handleException($ex): void\n- {\n- // write to error log so we can still find out what's up\n- error_log('Uncaught exception in class=\"' . get_class($ex) . '\" message=\"' . $ex->getMessage() . '\" line=\"' . $ex->getLine() . '\"');\n-\n- // clean up buffer\n- ob_end_clean();\n-\n- // server error mode go!\n- http_response_code(500);\n- }\n-\n- private function createItem($file, $id = null)\n- {\n- return new Item($file, $id);\n- }\n-\n- public function loadFilesByField($fieldName): array\n- {\n- // See if files are posted as JSON string (each file being base64 encoded)\n- $base64Items = $this->loadBase64FormattedFiles($fieldName);\n-\n- // retrieves posted file objects\n- $fileItems = $this->loadFileObjects($fieldName);\n-\n- // retrieves files already on server\n- $tmpItems = $this->loadFilesFromTemp($fieldName);\n-\n- // save newly received files to temp files folder (tmp items already are in that folder)\n- $this->saveAsTempFiles(array_merge($base64Items, $fileItems));\n-\n- // return items\n- return array_merge($base64Items, $fileItems, $tmpItems);\n- }\n-\n- private function loadFileObjects($fieldName)\n- {\n- $items = [];\n-\n- if (! isset($_FILES[$fieldName])) {\n- return $items;\n- }\n-\n- $FILE = $_FILES[$fieldName];\n-\n- if (is_array($FILE['tmp_name'])) {\n- foreach ($FILE['tmp_name'] as $index => $tmpName) {\n- array_push($items, $this->createItem([\n- 'tmp_name' => $FILE['tmp_name'][$index],\n- 'name' => $FILE['name'][$index],\n- 'size' => $FILE['size'][$index],\n- 'error' => $FILE['error'][$index],\n- 'type' => $FILE['type'][$index],\n- ]));\n- }\n- } else {\n- array_push($items, $this->createItem($FILE));\n- }\n-\n- return $items;\n- }\n-\n- private function loadBase64FormattedFiles($fieldName)\n- {\n- /*\n- // format:\n- {\n- \"id\": \"iuhv2cpsu\",\n- \"name\": \"picture.jpg\",\n- \"type\": \"image/jpeg\",\n- \"size\": 20636,\n- \"metadata\" : {...}\n- \"data\": \"/9j/4AAQSkZJRgABAQEASABIAA...\"\n- }\n- */\n-\n- $items = [];\n-\n- if (! isset($_POST[$fieldName])) {\n- return $items;\n- }\n-\n- // Handle posted files array\n- $values = $_POST[$fieldName];\n-\n- // Turn values in array if is submitted as single value\n- if (! is_array($values)) {\n- $values = isset($values) ? [$values] : [];\n- }\n-\n- // If files are found, turn base64 strings into actual file objects\n- foreach ($values as $value) {\n- // suppress error messages, we'll just investigate the object later\n- $obj = @json_decode($value);\n-\n- // skip values that failed to be decoded\n- if (! isset($obj)) {\n- continue;\n- }\n-\n- // test if this is a file object (matches the object described above)\n- if (! $this->isEncodedFile($obj)) {\n- continue;\n- }\n-\n- array_push($items, $this->createItem($this->createTempFile($obj)));\n- }\n-\n- return $items;\n- }\n-\n- private function isEncodedFile($obj)\n- {\n- return isset($obj->id) && isset($obj->data) && isset($obj->name) && isset($obj->type) && isset($obj->size);\n- }\n-\n- private function loadFilesFromTemp($fieldName)\n- {\n- $items = [];\n-\n- if (! isset($_POST[$fieldName])) {\n- return $items;\n- }\n-\n- // Handle posted ids array\n- $values = $_POST[$fieldName];\n-\n- // Turn values in array if is submitted as single value\n- if (! is_array($values)) {\n- $values = isset($values) ? [$values] : [];\n- }\n-\n- // test if value is actually a file id\n- foreach ($values as $value) {\n- if ($this->isFileId($value)) {\n- array_push($items, $this->createItem($this->getTempFile($value), $value));\n- }\n- }\n-\n- return $items;\n- }\n-\n- public function save($items, $path = 'uploads' . \\DIRECTORY_SEPARATOR)\n- {\n- // is list of files\n- if (is_array($items)) {\n- $results = [];\n- foreach ($items as $item) {\n- array_push($results, $this->saveFile($item, $path));\n- }\n-\n- return $results;\n- }\n-\n- // is single item\n- return $this->saveFile($items, $path);\n- }\n-\n- public function deleteTempFile($file_id): bool\n- {\n- return $this->deleteTempDirectory($file_id);\n- }\n-\n- /**\n- * @return array|bool\n- */\n- public function getRemoteURLData($url)\n- {\n- try {\n- $ch = curl_init();\n- curl_setopt($ch, CURLOPT_URL, $url);\n- curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);\n-\n- $content = curl_exec($ch);\n- if ($content === false) {\n- throw new Exception(curl_error($ch), curl_errno($ch));\n- }\n-\n- $type = curl_getinfo($ch, CURLINFO_CONTENT_TYPE);\n- $length = curl_getinfo($ch, CURLINFO_CONTENT_LENGTH_DOWNLOAD);\n- $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);\n-\n- curl_close($ch);\n-\n- $success = $code >= 200 && $code < 300;\n-\n- return [\n- 'code' => $code,\n- 'content' => $content,\n- 'type' => $type,\n- 'length' => $length,\n- 'success' => $success,\n- ];\n- } catch (Exception $e) {\n- return null;\n- }\n- }\n-\n- private function saveAsTempFiles($items): void\n- {\n- foreach ($items as $item) {\n- $this->saveTempFile($item);\n- }\n- }\n-\n- private function saveTempFile($file)\n- {\n- // make sure path name is safe\n- $path = $this->getSecureTempPath() . $file->getId() . \\DIRECTORY_SEPARATOR;\n-\n- // Creates a secure temporary directory to store the files in\n- $this->createSecureDirectory($path);\n-\n- // get source and target values\n- $source = $file->getFilename();\n- $target = $path . $file->getName();\n-\n- // Move uploaded file to this new secure directory\n- $result = $this->moveFile($source, $target);\n-\n- // Was not saved\n- if ($result !== true) {\n- return $result;\n- }\n-\n- // Make sure file is secure\n- $this->setSecureFilePermissions($target);\n-\n- // temp file stored successfully\n- return true;\n- }\n-\n- public function getTempFile($fileId)\n- {\n- // select all files in directory except .htaccess\n- foreach (glob($this->getSecureTempPath() . $fileId . \\DIRECTORY_SEPARATOR . '*.*') as $file) {\n- try {\n- $handle = fopen($file, 'rb');\n- $content = fread($handle, filesize($file));\n- fclose($handle);\n-\n- return [\n- 'name' => basename($file),\n- 'content' => $content,\n- 'type' => mime_content_type($file),\n- 'length' => filesize($file),\n- ];\n- } catch (Exception $e) {\n- return null;\n- }\n- }\n-\n- return false;\n- }\n-\n- public function getFile($file, $path)\n- {\n- try {\n- $filename = $path . \\DIRECTORY_SEPARATOR . $file;\n- $handle = fopen($filename, 'rb');\n- $content = fread($handle, filesize($filename));\n- fclose($handle);\n-\n- return [\n- 'name' => basename($filename),\n- 'content' => $content,\n- 'type' => mime_content_type($filename),\n- 'length' => filesize($filename),\n- ];\n- } catch (Exception $e) {\n- return null;\n- }\n- }\n-\n- private function saveFile($item, $path)\n- {\n- // nope\n- if (! isset($item)) {\n- return false;\n- }\n-\n- // if is file id\n- if (is_string($item)) {\n- return $this->moveFileById($item, $path);\n- }\n-\n- // is file object\n-\n- return $this->moveFileById($item->getId(), $path, $item->getName());\n- }\n-\n- private function moveFileById($fileId, $path, $fileName = null)\n- {\n- // select all files in directory except .htaccess\n- foreach (glob($this->getSecureTempPath() . $fileId . \\DIRECTORY_SEPARATOR . '*.*') as $file) {\n- $source = $file;\n- $target = $this->getSecurePath($path);\n-\n- $this->createDirectory($target);\n-\n- rename($source, $target . (isset($fileName) ? basename($fileName) : basename($file)));\n- }\n-\n- // remove directory\n- $this->deleteTempDirectory($fileId);\n-\n- // done!\n- return true;\n- }\n-\n- private function deleteTempDirectory($id): void\n- {\n- @array_map('unlink', glob($this->getSecureTempPath() . $id . \\DIRECTORY_SEPARATOR . '{.,}*', GLOB_BRACE));\n-\n- // remove temp directory\n- @rmdir($this->getSecureTempPath() . $id);\n- }\n-\n- private function createTempFile($file)\n- {\n- $tmp = tmpfile();\n- fwrite($tmp, base64_decode($file->data, true));\n- $meta = stream_get_meta_data($tmp);\n- $filename = $meta['uri'];\n-\n- return [\n- 'error' => 0,\n- 'size' => filesize($filename),\n- 'type' => $file->type,\n- 'name' => $file->name,\n- 'tmp_name' => $filename,\n- 'tmp' => $tmp,\n- ];\n- }\n-\n- private function moveFile($source, $target)\n- {\n- if (is_uploaded_file($source)) {\n- return move_uploaded_file($source, $target);\n- }\n-\n- $tmp = fopen($source, 'rb');\n- $result = file_put_contents($target, fread($tmp, filesize($source)));\n- fclose($tmp);\n-\n- return $result;\n- }\n-\n- private function getSecurePath($path)\n- {\n- return pathinfo($path)['dirname'] . \\DIRECTORY_SEPARATOR . basename($path) . \\DIRECTORY_SEPARATOR;\n- }\n-\n- private function getSecureTempPath()\n- {\n- return $this->getSecurePath($this->tmp_dir);\n- }\n-\n- private function setSecureFilePermissions($target): void\n- {\n- $stat = stat(dirname($target));\n- $perms = $stat['mode'] & 0000666;\n- @chmod($target, $perms);\n- }\n-\n- private function createDirectory($path)\n- {\n- if (is_dir($path)) {\n- return false;\n- }\n- mkdir($path, 0755, true);\n-\n- return true;\n- }\n-\n- private function createSecureDirectory($path): void\n- {\n- // !! If directory already exists we assume security is handled !!\n-\n- // Test if directory already exists and correct\n- if ($this->createDirectory($path)) {\n- // Add .htaccess file for security purposes\n- $content = '# Don\\'t list directory contents\n-IndexIgnore *\n-# Disable script execution\n-AddHandler cgi-script .php .pl .jsp .asp .sh .cgi\n-Options -ExecCGI -Indexes';\n- file_put_contents($path . '.htaccess', $content);\n- }\n- }\n-}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/AdminExtension.php",
"new_path": "src/Twig/AdminExtension.php",
"diff": "@@ -26,8 +26,6 @@ class AdminExtension extends AbstractExtension\n*/\npublic function getFunctions()\n{\n- $safe = ['is_safe' => ['html']];\n-\nreturn [\n];\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/ArrayExtension.php",
"new_path": "src/Twig/ArrayExtension.php",
"diff": "@@ -69,10 +69,8 @@ final class ArrayExtension extends AbstractExtension\n/**\n* Randomly shuffle the contents of a passed array.\n- *\n- * @param array $array\n*/\n- public function shuffle($array): array\n+ public function shuffle(array $array): array\n{\nif (is_array($array)) {\nshuffle($array);\n@@ -86,8 +84,6 @@ final class ArrayExtension extends AbstractExtension\n*\n* @param string $on\n* @param string $onSecondary\n- *\n- * @throws \\InvalidArgumentException\n*/\npublic function order(array $array, $on, $onSecondary = null): array\n{\n@@ -109,7 +105,9 @@ final class ArrayExtension extends AbstractExtension\n$this->orderAscendingSecondary = false;\n}\n- uasort($array, [$this, 'orderHelper']);\n+ uasort($array, function ($a, $b): void {\n+ $this->orderHelper($a, $b);\n+ });\nreturn $array;\n}\n@@ -117,10 +115,8 @@ final class ArrayExtension extends AbstractExtension\n/**\n* Get sorting order of name, stripping possible \"DESC\", \"ASC\", and also\n* return the sorting order.\n- *\n- * @param string $name\n*/\n- private function getSortOrder($name = '-datepublish'): array\n+ private function getSortOrder(string $name = '-datepublish'): array\n{\n$parts = explode(' ', $name);\n$fieldName = $parts[0];\n@@ -139,9 +135,6 @@ final class ArrayExtension extends AbstractExtension\n/**\n* Helper function for sorting an array of \\Bolt\\Legacy\\Content.\n- *\n- * @param \\Bolt\\Legacy\\Content|array $a\n- * @param \\Bolt\\Legacy\\Content|array $b\n*/\nprivate function orderHelper($a, $b): bool\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/HtmlExtension.php",
"new_path": "src/Twig/HtmlExtension.php",
"diff": "@@ -26,7 +26,6 @@ class HtmlExtension extends AbstractExtension\npublic function getFunctions()\n{\n$safe = ['is_safe' => ['html']];\n- $env = ['needs_environment' => true];\nreturn [\nnew TwigFilter('markdown', [$this, 'markdown'], $safe),\n@@ -39,7 +38,6 @@ class HtmlExtension extends AbstractExtension\npublic function getFilters()\n{\n$safe = ['is_safe' => ['html']];\n- $env = ['needs_environment' => true];\nreturn [\nnew TwigFilter('markdown', [$this, 'markdown'], $safe),\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/ImageExtension.php",
"new_path": "src/Twig/ImageExtension.php",
"diff": "@@ -13,14 +13,14 @@ use Twig\\TwigFunction;\nclass ImageExtension extends AbstractExtension\n{\n- private $key;\n+ private $secret = '';\n- private $config;\n+ private $config = [];\npublic function __construct(Config $config)\n{\n- $this->key = 'foo';\n$this->config = $config;\n+ $this->secret = $this->config->get('general/secret');\n}\n/**\n@@ -58,8 +58,6 @@ class ImageExtension extends AbstractExtension\nreturn '';\n}\n- $secret = $this->config->get('general/secret');\n-\n$params = [\n'w' => $width,\n'h' => $height,\n@@ -73,7 +71,7 @@ class ImageExtension extends AbstractExtension\n}\n// Create an instance of the URL builder\n- $urlBuilder = UrlBuilderFactory::create('/thumbs/', $secret);\n+ $urlBuilder = UrlBuilderFactory::create('/thumbs/', $this->secret);\n// Generate a URL\nreturn $urlBuilder->getUrl($filename, $params);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/LocaleExtension.php",
"new_path": "src/Twig/LocaleExtension.php",
"diff": "@@ -4,7 +4,6 @@ declare(strict_types=1);\nnamespace Bolt\\Twig;\n-use Bolt\\Configuration\\Config;\nuse Symfony\\Component\\HttpFoundation\\Request;\nuse Symfony\\Component\\Intl\\Intl;\nuse Symfony\\Component\\Routing\\Generator\\UrlGeneratorInterface;\n@@ -18,19 +17,15 @@ class LocaleExtension extends AbstractExtension\n/** @var array */\nprivate $localeCodes = [];\n- /** @var Config */\n- private $config;\n-\n/** @var Collection */\nprivate $locales;\n/** @var UrlGeneratorInterface */\nprivate $urlGenerator;\n- public function __construct(Config $config, string $locales, UrlGeneratorInterface $urlGenerator)\n+ public function __construct(string $locales, UrlGeneratorInterface $urlGenerator)\n{\n$this->localeCodes = explode('|', $locales);\n- $this->config = $config;\n$this->urlGenerator = $urlGenerator;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/RecordExtension.php",
"new_path": "src/Twig/RecordExtension.php",
"diff": "@@ -5,6 +5,7 @@ declare(strict_types=1);\nnamespace Bolt\\Twig;\nuse Bolt\\Helpers\\Excerpt;\n+use Twig\\Environment;\nuse Twig\\Extension\\AbstractExtension;\nuse Twig\\TwigFilter;\nuse Twig\\TwigFunction;\n@@ -35,7 +36,6 @@ class RecordExtension extends AbstractExtension\npublic function getFilters()\n{\n$safe = ['is_safe' => ['html']];\n- $deprecated = ['deprecated' => true];\nreturn [\nnew TwigFilter('excerpt', [$this, 'excerpt'], $safe),\n@@ -53,6 +53,7 @@ class RecordExtension extends AbstractExtension\n}\n/**\n+ * @param string $text\n* @param int $length\n*/\npublic function excerpt($text, $length = 100): string\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/TextExtension.php",
"new_path": "src/Twig/TextExtension.php",
"diff": "@@ -18,8 +18,6 @@ class TextExtension extends AbstractExtension\n*/\npublic function getFilters()\n{\n- $safe = ['is_safe' => ['html']];\n-\nreturn [\nnew TwigFilter('json_decode', [$this, 'dummy']),\nnew TwigFilter('safestring', [$this, 'safeString']),\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Working on code quality
|
95,124 |
20.11.2018 00:39:03
| -3,600 |
6c5691c5abf9302c430ef84d08a933bfa8436645
|
add button clear cache
|
[
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/ClearCacheController.php",
"new_path": "src/Controller/Backend/ClearCacheController.php",
"diff": "@@ -5,6 +5,7 @@ namespace Bolt\\Controller\\Backend;\nuse Symfony\\Bundle\\FrameworkBundle\\Console\\Application;\nuse Symfony\\Component\\Console\\Input\\ArrayInput;\nuse Symfony\\Component\\HttpKernel\\KernelInterface;\n+use Symfony\\Component\\HttpFoundation\\Response;\nuse Symfony\\Component\\Routing\\Annotation\\Route;\nuse Bolt\\Controller\\BaseController;\n@@ -13,7 +14,7 @@ class ClearCacheController extends BaseController\n/**\n* @Route(\"/clearcache\", name=\"bolt_clear_cache\")\n*/\n- public function index( KernelInterface $kernel)\n+ public function index( KernelInterface $kernel): Response\n{\n$application = new Application($kernel);\n$application->setAutoExit(false);\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/clearcache/clearcache.html.twig",
"new_path": "templates/clearcache/clearcache.html.twig",
"diff": "<div class=\"row\">\n<div class=\"col-md-9\">\n+ <a href=\"{{ path('bolt_clear_cache') }}\" class=\"btn btn-primary\">{{ 'caption.clear_cache'|trans }}</a>\n</div>\n</div>\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
add button clear cache
|
95,144 |
20.11.2018 07:53:26
| -3,600 |
03f2e6221d45edf7878bed7f413bc454e9fdb31c
|
CS fixes, capture output
|
[
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/ClearCacheController.php",
"new_path": "src/Controller/Backend/ClearCacheController.php",
"diff": "<?php\n+declare(strict_types=1);\n+\nnamespace Bolt\\Controller\\Backend;\n+use Bolt\\Controller\\BaseController;\nuse Symfony\\Bundle\\FrameworkBundle\\Console\\Application;\nuse Symfony\\Component\\Console\\Input\\ArrayInput;\n-use Symfony\\Component\\HttpKernel\\KernelInterface;\n+use Symfony\\Component\\Console\\Output\\BufferedOutput;\nuse Symfony\\Component\\HttpFoundation\\Response;\n+use Symfony\\Component\\HttpKernel\\KernelInterface;\nuse Symfony\\Component\\Routing\\Annotation\\Route;\n-use Bolt\\Controller\\BaseController;\nclass ClearCacheController extends BaseController\n{\n@@ -19,13 +22,18 @@ class ClearCacheController extends BaseController\n$application = new Application($kernel);\n$application->setAutoExit(false);\n- $input = new ArrayInput(array(\n- 'command' => 'cache:clear'\n- ));\n+ $input = new ArrayInput([\n+ 'command' => 'cache:clear',\n+ ]);\n+ $output = new BufferedOutput();\n+\n+ $application->run($input, $output);\n+ $this->addFlash('success', 'Cache cleared!');\n- $application->run($input);\n- $this->addFlash('success', '');\n+ $twigvars = [\n+ 'output' => $output->fetch(),\n+ ];\n- return $this->render('clearcache/clearcache.html.twig');\n+ return $this->render('clearcache/clearcache.html.twig', $twigvars);\n}\n}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
CS fixes, capture output
|
95,144 |
20.11.2018 07:53:59
| -3,600 |
386f921821f292bb413bcbff117628a5b07ea206
|
Display output
|
[
{
"change_type": "MODIFY",
"old_path": "templates/clearcache/clearcache.html.twig",
"new_path": "templates/clearcache/clearcache.html.twig",
"diff": "{% block main %}\n+ <pre style=\"font-family: monospace; border: 1px solid #BBB; background: #DDD; padding: 1rem; font-size: 0.8rem; line-height: 1.0rem;\">\n+ {{- output|trim -}}\n+ </pre>\n+\n<div class=\"row\">\n<div class=\"col-md-9\">\n<a href=\"{{ path('bolt_clear_cache') }}\" class=\"btn btn-primary\">{{ 'caption.clear_cache'|trans }}</a>\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Display output
|
95,168 |
20.11.2018 10:27:22
| -3,600 |
c130b77a574ba4cdb07395e715dc2cc61d5e8508
|
Remove div wrappers for password and email
|
[
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/email.html.twig",
"new_path": "templates/_partials/fields/email.html.twig",
"diff": "{% extends '@bolt/_partials/fields/_base.html.twig' %}\n{% block field %}\n- <div id=\"user-email\">\n<field-email\n:id=\"'{{ id }}'\"\n:name=\"'{{ name }}'\"\n:value=\"{{ value|json_encode() }}\"\n></field-email>\n- </div>\n{% endblock %}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/password.html.twig",
"new_path": "templates/_partials/fields/password.html.twig",
"diff": "{% extends '@bolt/_partials/fields/_base.html.twig' %}\n{% block field %}\n- <div id=\"user-password\">\n<field-password\n:id=\"'{{ id }}'\"\n:name=\"'{{ name }}'\"\n:value=\"{{ value|json_encode() }}\"\n></field-password>\n- </div>\n{% endblock %}\n\\ No newline at end of file\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Remove div wrappers for password and email
|
95,168 |
20.11.2018 10:55:44
| -3,600 |
bd19aec1768b9456669b90ab0d12c7f9beb95e8d
|
Add togglePassword method to make password visible
|
[
{
"change_type": "MODIFY",
"old_path": "assets/js/Components/Password/Password.vue",
"new_path": "assets/js/Components/Password/Password.vue",
"diff": "autocomplete=\"new-password\"\n/>\n- <i class=\"input-group-text fas fa-eye\"></i>\n+ <i class=\"input-group-text fas fa-eye\" @click=\"togglePassword\"></i>\n</div>\n</div>\n</template>\n<script>\nexport default {\nname: \"field-password\",\n- props: [\"value\", \"name\", \"id\"]\n+ props: [\"value\", \"name\", \"id\"],\n+ methods: {\n+ togglePassword: function(event) {\n+ let inputElement = event.target.previousElementSibling;\n+ let inputType = inputElement.attributes.getNamedItem(\"type\").value;\n+\n+ if (inputType === \"password\") {\n+ inputElement.setAttribute(\"type\", \"text\");\n+ } else if (inputType === \"text\") {\n+ inputElement.setAttribute(\"type\", \"password\");\n+ }\n+ }\n+ }\n};\n</script>\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Add togglePassword method to make password visible
|
95,168 |
20.11.2018 11:29:11
| -3,600 |
a9dd47a3b0aa2258999b2fa7992d9576d94a57b1
|
Toggle eye icon when password is viewed or hidden
|
[
{
"change_type": "MODIFY",
"old_path": "assets/js/Components/Password/Password.vue",
"new_path": "assets/js/Components/Password/Password.vue",
"diff": "@@ -21,13 +21,16 @@ export default {\nprops: [\"value\", \"name\", \"id\"],\nmethods: {\ntogglePassword: function(event) {\n+ let iconElement = event.target;\nlet inputElement = event.target.previousElementSibling;\nlet inputType = inputElement.attributes.getNamedItem(\"type\").value;\nif (inputType === \"password\") {\ninputElement.setAttribute(\"type\", \"text\");\n+ iconElement.classList.replace('fa-eye', 'fa-eye-slash')\n} else if (inputType === \"text\") {\ninputElement.setAttribute(\"type\", \"password\");\n+ iconElement.classList.replace('fa-eye-slash', 'fa-eye')\n}\n}\n}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Toggle eye icon when password is viewed or hidden
|
95,144 |
20.11.2018 12:11:43
| -3,600 |
e249bc58638e777f9546b7ef9da87482b190c9b2
|
Tweaking typehints.
|
[
{
"change_type": "MODIFY",
"old_path": "src/Twig/ArrayExtension.php",
"new_path": "src/Twig/ArrayExtension.php",
"diff": "@@ -4,6 +4,7 @@ declare(strict_types=1);\nnamespace Bolt\\Twig;\n+use Bolt\\Entity\\Content;\nuse Twig\\Extension\\AbstractExtension;\nuse Twig\\TwigFilter;\nuse Twig\\TwigFunction;\n@@ -136,7 +137,7 @@ final class ArrayExtension extends AbstractExtension\n/**\n* Helper function for sorting an array of \\Bolt\\Legacy\\Content.\n*/\n- private function orderHelper($a, $b): bool\n+ private function orderHelper(Content $a, Content $b): bool\n{\n$aVal = $a[$this->orderOn];\n$bVal = $b[$this->orderOn];\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/RecordExtension.php",
"new_path": "src/Twig/RecordExtension.php",
"diff": "@@ -52,11 +52,7 @@ class RecordExtension extends AbstractExtension\nreturn $input;\n}\n- /**\n- * @param string $text\n- * @param int $length\n- */\n- public function excerpt($text, $length = 100): string\n+ public function excerpt(string $text, int $length = 100): string\n{\n$excerpter = new Excerpt($text);\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Tweaking typehints.
|
95,144 |
21.11.2018 17:58:06
| -3,600 |
965ba6843f09f92cd1787e3be6646f6cb35a39da
|
Working on CS some more.
|
[
{
"change_type": "MODIFY",
"old_path": "src/Content/MediaFactory.php",
"new_path": "src/Content/MediaFactory.php",
"diff": "@@ -65,6 +65,10 @@ class MediaFactory\n->setArea($area);\n}\n+ if (! in_array($file->getExtension(), $this->mediatypes, true)) {\n+ die('Not a valid media type.');\n+ }\n+\n$media->setType($file->getExtension())\n->setModifiedAt(Carbon::createFromTimestamp($file->getMTime()))\n->setCreatedAt(Carbon::createFromTimestamp($file->getCTime()))\n@@ -116,12 +120,12 @@ class MediaFactory\nreturn null;\n}\n- if (! is_object($user = $token->getUser())) {\n- // e.g. anonymous authentication\n- return null;\n+ if (is_object($token->getUser())) {\n+ return $token->getUser();\n}\n- return $user;\n+ // e.g. anonymous authentication\n+ return null;\n}\npublic function createFromFilename($area, $path, $filename): Media\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Async/News.php",
"new_path": "src/Controller/Async/News.php",
"diff": "@@ -38,6 +38,11 @@ final class News\n{\n$news = $this->getNews($request->getHost());\n+ // Todo: Make sure this works as intended\n+ if ($this->config->get('news') !== false) {\n+ return new JsonResponse([], 200);\n+ }\n+\n// One 'alert' and one 'info' max. Regular info-items can be disabled,\n// but Alerts can't.\n$context = [\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Async/Uploader.php",
"new_path": "src/Controller/Async/Uploader.php",
"diff": "@@ -6,7 +6,6 @@ namespace Bolt\\Controller\\Async;\nuse Bolt\\Configuration\\Config;\nuse Bolt\\Content\\MediaFactory;\n-use Bolt\\Media\\RequestHandler;\nuse Cocur\\Slugify\\Slugify;\nuse Doctrine\\Common\\Persistence\\ObjectManager;\nuse Sirius\\Upload\\Handler;\n@@ -21,19 +20,15 @@ class Uploader\n/** @var MediaFactory */\nprivate $mediaFactory;\n- /** @var RequestHandler */\n- private $requestHandler;\n-\n/** @var ObjectManager */\nprivate $manager;\n/** @var Config */\nprivate $config;\n- public function __construct(MediaFactory $mediaFactory, RequestHandler $requestHandler, ObjectManager $manager, Config $config)\n+ public function __construct(MediaFactory $mediaFactory, ObjectManager $manager, Config $config)\n{\n$this->mediaFactory = $mediaFactory;\n- $this->requestHandler = $requestHandler;\n$this->manager = $manager;\n$this->config = $config;\n}\n@@ -79,7 +74,7 @@ class Uploader\n$messages = $result->getMessages();\n}\n- return new Response('Not OK');\n+ return new Response('Not OK: ' . implode(', ', $messages));\n}\nprivate function sanitiseFilename(string $filename): string\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/ContentEditController.php",
"new_path": "src/Controller/Backend/ContentEditController.php",
"diff": "@@ -96,7 +96,9 @@ class ContentEditController extends BaseController\nprivate function updateFieldFromPost(string $key, $postfield, Content $content): void\n{\n- if (! $field = $content->getField($key)) {\n+ if ($content->getField($key)) {\n+ $field = $content->getField($key);\n+ } else {\n$fields = collect($content->getDefinition()->get('fields'));\n$field = Field::factory($fields->get($key)['type']);\n$field->setName($key);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/EditMediaController.php",
"new_path": "src/Controller/Backend/EditMediaController.php",
"diff": "@@ -9,7 +9,6 @@ use Bolt\\Configuration\\Config;\nuse Bolt\\Content\\MediaFactory;\nuse Bolt\\Controller\\BaseController;\nuse Bolt\\Entity\\Media;\n-use Bolt\\Repository\\MediaRepository;\nuse Doctrine\\Common\\Persistence\\ObjectManager;\nuse Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\Security;\nuse Symfony\\Component\\Finder\\SplFileInfo;\n@@ -36,9 +35,6 @@ class EditMediaController extends BaseController\n/** @var UrlGeneratorInterface */\nprivate $urlGenerator;\n- /** @var MediaRepository */\n- private $mediaRepository;\n-\n/** @var Areas */\nprivate $areas;\n@@ -53,7 +49,6 @@ class EditMediaController extends BaseController\nCsrfTokenManagerInterface $csrfTokenManager,\nObjectManager $manager,\nUrlGeneratorInterface $urlGenerator,\n- MediaRepository $mediaRepository,\nAreas $areas,\nMediaFactory $mediaFactory\n) {\n@@ -61,7 +56,6 @@ class EditMediaController extends BaseController\n$this->manager = $manager;\n$this->urlGenerator = $urlGenerator;\n- $this->mediaRepository = $mediaRepository;\n$this->areas = $areas;\n$this->mediaFactory = $mediaFactory;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Frontend/PreviewController.php",
"new_path": "src/Controller/Frontend/PreviewController.php",
"diff": "@@ -29,9 +29,12 @@ class PreviewController extends BaseController\n$homepage = $this->getOption('theme/homepage') ?: $this->getOption('general/homepage');\n// todo get $homepage content.\n+ $twigvars = [\n+ 'record' => $homepage,\n+ ];\n$templates = $this->templateChooser->homepage();\n- return $this->renderTemplate($templates, []);\n+ return $this->renderTemplate($templates, $twigvars);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/ImageController.php",
"new_path": "src/Controller/ImageController.php",
"diff": "@@ -36,8 +36,8 @@ class ImageController\n'cache' => $this->config->getPath('cache', true, 'thumbnails'),\n]);\n- if ($path = $request->query->get('path')) {\n- $filename = sprintf('%s/%s', $path, $filename);\n+ if ($request->query->get('path')) {\n+ $filename = sprintf('%s/%s', $request->query->get('path'), $filename);\n}\n/** @var StreamedResponse $response */\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Entity/Content.php",
"new_path": "src/Entity/Content.php",
"diff": "@@ -165,6 +165,11 @@ class Content\n$this->urlGenerator = $urlGenerator;\n}\n+ public function getUrlGenerator(): UrlGeneratorInterface\n+ {\n+ return $this->urlGenerator;\n+ }\n+\npublic function getDefinition()\n{\nreturn $this->contentTypeDefinition;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Entity/ContentMagicTraits.php",
"new_path": "src/Entity/ContentMagicTraits.php",
"diff": "@@ -68,8 +68,8 @@ trait ContentMagicTraits\npublic function magicTitleFields(): array\n{\n// First, see if we have a \"title format\" in the contenttype.\n- if ($title_format = $this->getDefinition()->get('title_format')) {\n- return (array) $title_format;\n+ if ($this->getDefinition()->get('title_format')) {\n+ return (array) $this->getDefinition()->get('title_format');\n}\n// Alternatively, see if we have a field named 'title' or somesuch.\n@@ -79,13 +79,13 @@ trait ContentMagicTraits\n$names = array_merge($names, ['nombre', 'sujeto']); // Spanish\nforeach ($names as $name) {\n- if ($field = $this->get($name)) {\n+ if ($this->get($name)) {\nreturn (array) $name;\n}\n}\n// Otherwise, grab the first field of type 'text', and assume that's the title.\n- foreach ($this->getFields() as $key => $field) {\n+ foreach ($this->getFields() as $field) {\nif ($field->getDefinition()->get('type') === 'text') {\nreturn [$field->getDefinition()->get('name')];\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/EventSubscriber/LocaleSubscriber.php",
"new_path": "src/EventSubscriber/LocaleSubscriber.php",
"diff": "@@ -24,10 +24,12 @@ class LocaleSubscriber implements EventSubscriberInterface\nreturn;\n}\n// try to see if the locale has been set as a _locale routing parameter\n- if ($locale = $request->attributes->get('_locale')) {\n+ if ($request->attributes->get('_locale')) {\n+ $locale = $request->attributes->get('_locale');\n$request->getSession()->set('_locale', $locale);\n$request->setLocale($locale);\n- } elseif ($locale = $request->query->get('_locale')) {\n+ } elseif ($request->query->get('_locale')) {\n+ $locale = $request->query->get('_locale');\n$request->getSession()->set('_locale', $locale);\n$request->setLocale($locale);\n} else {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Helpers/Excerpt.php",
"new_path": "src/Helpers/Excerpt.php",
"diff": "@@ -42,7 +42,7 @@ class Excerpt\nif ($this->content instanceof Content) {\n$skip_fields = $includeTitle ? $this->content->magicTitleFields() : [];\n- foreach ($this->content->getFields() as $key => $field) {\n+ foreach ($this->content->getFields() as $field) {\nif (! in_array($field->getName(), $skip_fields, true) && $field->isExcerptable()) {\n$excerpt .= (string) $field;\n}\n@@ -70,10 +70,8 @@ class Excerpt\n* Find the locations of each of the words.\n* Nothing exciting here. The array_unique is required, unless you decide\n* to make the words unique before passing in.\n- *\n- * @param string $fulltext\n*/\n- private function extractLocations(array $words, $fulltext): array\n+ private function extractLocations(array $words, string $fulltext): array\n{\n$locations = [];\nforeach ($words as $word) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Helpers/Str.php",
"new_path": "src/Helpers/Str.php",
"diff": "@@ -48,15 +48,13 @@ class Str extends \\Bolt\\Common\\Str\n/**\n* Add 'soft hyphens' ­ to a string, so that it won't break layout in HTML when\n* using strings without spaces or dashes. Only breaks in long (> 19 chars) words.\n- *\n- * @param string $str\n*/\n- public static function shyphenate($str): string\n+ public static function shyphenate(string $str): string\n{\n$res = preg_match_all('/([a-z0-9]{19,})/i', $str, $matches);\nif ($res) {\n- foreach ($matches[1] as $key => $match) {\n+ foreach ($matches[1] as $match) {\n$str = str_replace($match, wordwrap($match, 10, '­', true), $str);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/TemplateChooser.php",
"new_path": "src/TemplateChooser.php",
"diff": "@@ -32,18 +32,14 @@ class TemplateChooser\n$templates = collect([]);\n// First candidate: Theme-specific config.yml file.\n- if ($template = $this->config->get('theme/homepage_template')) {\n- $templates->push($template);\n- }\n+ $templates->push($this->config->get('theme/homepage_template'));\n// Second candidate: Global config.yml file.\n- if ($template = $this->config->get('general/homepage_template')) {\n- $templates->push($template);\n- }\n+ $templates->push($this->config->get('general/homepage_template'));\nif (empty($content)) {\n// Fallback if no content: index.twig\n- $templates->push('index.html.twig');\n+ $templates->push('index.html.twig')->push('index.twig');\n} elseif (is_array($content)) {\n// Fallback with multiple content: use listing() to choose template\n$first = reset($content);\n@@ -94,14 +90,11 @@ class TemplateChooser\n// Fourth candidate: a template with the same filename as the name of\n// the contenttype.\n- if (isset($record->contenttype['singular_slug'])) {\n$templates->push($record->contenttype['singular_slug'] . '.html.twig');\n- }\n+ $templates->push($record->contenttype['singular_slug'] . '.twig');\n// Fifth candidate: Theme-specific config.yml file.\n- if ($template = $this->config->get('theme/record_template')) {\n- $templates->push($template);\n- }\n+ $templates->push($this->config->get('theme/record_template'));\n// Sixth candidate: global config.yml\n$templates->push($this->config->get('general/record_template'));\n@@ -109,7 +102,7 @@ class TemplateChooser\n// Seventh candidate: fallback to 'record.html.twig'\n$templates->push('record.html.twig');\n- return $templates->unique();\n+ return $templates->unique()->filter();\n}\n/**\n@@ -126,14 +119,11 @@ class TemplateChooser\n// Second candidate: a template with the same filename as the name of\n// the contenttype.\n- if (! empty($contenttype['listing_template'])) {\n$templates->push($contenttype['slug'] . '.html.twig');\n- }\n+ $templates->push($contenttype['slug'] . '.twig');\n// Third candidate: Theme-specific config.yml file.\n- if ($template = $this->config->get('theme/listing_template')) {\n- $templates->push($template);\n- }\n+ $templates->push($this->config->get('theme/listing_template'));\n// Fourth candidate: Global config.yml\n$templates->push($this->config->get('general/listing_template'));\n@@ -141,7 +131,7 @@ class TemplateChooser\n// Fifth candidate: fallback to 'listing.html.twig'\n$templates->push('listing.html.twig');\n- return $templates->unique();\n+ return $templates->unique()->filter();\n}\n/**\n@@ -152,19 +142,15 @@ class TemplateChooser\n$templates = collect([]);\n// First candidate: defined specifically in the taxonomy\n- if ($template = $this->config->get('taxonomy/' . $taxonomyslug . '/listing_template')) {\n- $templates->push($template);\n- }\n+ $templates->push($this->config->get('taxonomy/' . $taxonomyslug . '/listing_template'));\n// Second candidate: Theme-specific config.yml file.\n- if ($template = $this->config->get('theme/listing_template')) {\n- $templates->push($template);\n- }\n+ $templates->push($this->config->get('theme/listing_template'));\n// Third candidate: Global config.yml\n$templates->push($this->config->get('general/listing_template'));\n- return $templates->unique();\n+ return $templates->unique()->filter();\n}\n/**\n@@ -175,19 +161,15 @@ class TemplateChooser\n$templates = collect([]);\n// First candidate: specific search setting in global config.\n- if ($template = $this->config->get('theme/search_results_template')) {\n- $templates->push($template);\n- }\n+ $templates->push($this->config->get('theme/search_results_template'));\n// Second candidate: specific search setting in global config.\n- if ($template = $this->config->get('general/search_results_template')) {\n- $templates->push($template);\n- }\n+ $templates->push($this->config->get('general/search_results_template'));\n// Third candidate: listing config setting.\n$templates->push($this->config->get('general/listing_template'));\n- return $templates->unique();\n+ return $templates->unique()->filter();\n}\n/**\n@@ -198,13 +180,11 @@ class TemplateChooser\n$templates = collect([]);\n// First candidate: Theme-specific config.\n- if ($template = $this->config->get('theme/maintenance_template')) {\n- $templates->push($template);\n- }\n+ $templates->push($this->config->get('theme/maintenance_template'));\n// Second candidate: global config.\n$templates->push($this->config->get('general/maintenance_template'));\n- return $templates->unique();\n+ return $templates->unique()->filter();\n}\n}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Working on CS some more.
|
95,144 |
21.11.2018 20:14:12
| -3,600 |
227b40a1aff3d42b3a2e6c8d95647a43c9115808
|
Working on CS
|
[
{
"change_type": "MODIFY",
"old_path": "src/Controller/Async/Uploader.php",
"new_path": "src/Controller/Async/Uploader.php",
"diff": "@@ -74,7 +74,7 @@ class Uploader\n$messages = $result->getMessages();\n}\n- return new Response('Not OK: ' . implode(', ', $messages));\n+ return new Response('Not OK: ' . implode(', ', $messages), 400);\n}\nprivate function sanitiseFilename(string $filename): string\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/ContentEditController.php",
"new_path": "src/Controller/Backend/ContentEditController.php",
"diff": "@@ -96,7 +96,7 @@ class ContentEditController extends BaseController\nprivate function updateFieldFromPost(string $key, $postfield, Content $content): void\n{\n- if ($content->getField($key)) {\n+ if ($content->hasField($key)) {\n$field = $content->getField($key);\n} else {\n$fields = collect($content->getDefinition()->get('fields'));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/ImageController.php",
"new_path": "src/Controller/ImageController.php",
"diff": "@@ -36,7 +36,7 @@ class ImageController\n'cache' => $this->config->getPath('cache', true, 'thumbnails'),\n]);\n- if ($request->query->get('path')) {\n+ if ($request->query->has('path')) {\n$filename = sprintf('%s/%s', $request->query->get('path'), $filename);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Entity/Content.php",
"new_path": "src/Entity/Content.php",
"diff": "@@ -297,6 +297,11 @@ class Content\nreturn $this->fields;\n}\n+ public function hasField(string $name): bool\n+ {\n+ return collect($this->fields)->contains('name', $name);\n+ }\n+\npublic function getField(string $name): ?Field\n{\nreturn collect($this->fields)->where('name', $name)->first();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Entity/ContentMagicTraits.php",
"new_path": "src/Entity/ContentMagicTraits.php",
"diff": "@@ -67,9 +67,11 @@ trait ContentMagicTraits\npublic function magicTitleFields(): array\n{\n+ $definition = $this->getDefinition();\n+\n// First, see if we have a \"title format\" in the contenttype.\n- if ($this->getDefinition()->get('title_format')) {\n- return (array) $this->getDefinition()->get('title_format');\n+ if ($definition->has('title_format')) {\n+ return (array) $definition->get('title_format');\n}\n// Alternatively, see if we have a field named 'title' or somesuch.\n@@ -86,8 +88,8 @@ trait ContentMagicTraits\n// Otherwise, grab the first field of type 'text', and assume that's the title.\nforeach ($this->getFields() as $field) {\n- if ($field->getDefinition()->get('type') === 'text') {\n- return [$field->getDefinition()->get('name')];\n+ if ($definition->get('type') === 'text') {\n+ return [$definition->get('name')];\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/EventSubscriber/LocaleSubscriber.php",
"new_path": "src/EventSubscriber/LocaleSubscriber.php",
"diff": "@@ -24,11 +24,11 @@ class LocaleSubscriber implements EventSubscriberInterface\nreturn;\n}\n// try to see if the locale has been set as a _locale routing parameter\n- if ($request->attributes->get('_locale')) {\n+ if ($request->attributes->has('_locale')) {\n$locale = $request->attributes->get('_locale');\n$request->getSession()->set('_locale', $locale);\n$request->setLocale($locale);\n- } elseif ($request->query->get('_locale')) {\n+ } elseif ($request->query->has('_locale')) {\n$locale = $request->query->get('_locale');\n$request->getSession()->set('_locale', $locale);\n$request->setLocale($locale);\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Working on CS
|
95,144 |
21.11.2018 21:29:38
| -3,600 |
ae7f85b1cbd75787341ad77a6355daca9b841129
|
Update composer (to fix Travis)
|
[
{
"change_type": "MODIFY",
"old_path": "composer.json",
"new_path": "composer.json",
"diff": "\"api-platform/api-pack\": \"^1.1\",\n\"bolt/common\": \"^2.0\",\n\"cocur/slugify\": \"^3.1\",\n- \"doctrine/common\": \"2.8.1\",\n+ \"doctrine/common\": \"^2.8\",\n\"erusev/parsedown\": \"^1.7\",\n\"ezyang/htmlpurifier\": \"^4.10\",\n\"fzaninotto/faker\": \"^1.8\",\n"
},
{
"change_type": "MODIFY",
"old_path": "composer.lock",
"new_path": "composer.lock",
"diff": "{\n\"_readme\": [\n\"This file locks the dependencies of your project to a known state\",\n- \"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file\",\n+ \"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies\",\n\"This file is @generated automatically\"\n],\n- \"content-hash\": \"c7338a1bc99560f5748fec1b86c543f5\",\n+ \"content-hash\": \"8bc90572cb8568cd3c8a176762a36aee\",\n\"packages\": [\n{\n\"name\": \"api-platform/api-pack\",\n},\n{\n\"name\": \"doctrine/common\",\n- \"version\": \"v2.8.1\",\n+ \"version\": \"v2.10.0\",\n\"source\": {\n\"type\": \"git\",\n\"url\": \"https://github.com/doctrine/common.git\",\n- \"reference\": \"f68c297ce6455e8fd794aa8ffaf9fa458f6ade66\"\n+ \"reference\": \"30e33f60f64deec87df728c02b107f82cdafad9d\"\n},\n\"dist\": {\n\"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/doctrine/common/zipball/f68c297ce6455e8fd794aa8ffaf9fa458f6ade66\",\n- \"reference\": \"f68c297ce6455e8fd794aa8ffaf9fa458f6ade66\",\n+ \"url\": \"https://api.github.com/repos/doctrine/common/zipball/30e33f60f64deec87df728c02b107f82cdafad9d\",\n+ \"reference\": \"30e33f60f64deec87df728c02b107f82cdafad9d\",\n\"shasum\": \"\"\n},\n\"require\": {\n- \"doctrine/annotations\": \"1.*\",\n- \"doctrine/cache\": \"1.*\",\n- \"doctrine/collections\": \"1.*\",\n- \"doctrine/inflector\": \"1.*\",\n- \"doctrine/lexer\": \"1.*\",\n- \"php\": \"~7.1\"\n+ \"doctrine/annotations\": \"^1.0\",\n+ \"doctrine/cache\": \"^1.0\",\n+ \"doctrine/collections\": \"^1.0\",\n+ \"doctrine/event-manager\": \"^1.0\",\n+ \"doctrine/inflector\": \"^1.0\",\n+ \"doctrine/lexer\": \"^1.0\",\n+ \"doctrine/persistence\": \"^1.1\",\n+ \"doctrine/reflection\": \"^1.0\",\n+ \"php\": \"^7.1\"\n},\n\"require-dev\": {\n- \"phpunit/phpunit\": \"^5.7\"\n+ \"doctrine/coding-standard\": \"^1.0\",\n+ \"phpunit/phpunit\": \"^6.3\",\n+ \"squizlabs/php_codesniffer\": \"^3.0\",\n+ \"symfony/phpunit-bridge\": \"^4.0.5\"\n},\n\"type\": \"library\",\n\"extra\": {\n\"branch-alias\": {\n- \"dev-master\": \"2.8.x-dev\"\n+ \"dev-master\": \"2.10.x-dev\"\n}\n},\n\"autoload\": {\n{\n\"name\": \"Johannes Schmitt\",\n\"email\": \"schmittjoh@gmail.com\"\n+ },\n+ {\n+ \"name\": \"Marco Pivetta\",\n+ \"email\": \"ocramius@gmail.com\"\n}\n],\n- \"description\": \"Common Library for Doctrine projects\",\n- \"homepage\": \"http://www.doctrine-project.org\",\n+ \"description\": \"PHP Doctrine Common project is a library that provides additional functionality that other Doctrine projects depend on such as better reflection support, persistence interfaces, proxies, event system and much more.\",\n+ \"homepage\": \"https://www.doctrine-project.org/projects/common.html\",\n\"keywords\": [\n- \"annotations\",\n- \"collections\",\n- \"eventmanager\",\n- \"persistence\",\n- \"spl\"\n+ \"common\",\n+ \"doctrine\",\n+ \"php\"\n],\n- \"time\": \"2017-08-31T08:43:38+00:00\"\n+ \"time\": \"2018-11-21T01:24:55+00:00\"\n},\n{\n\"name\": \"doctrine/dbal\",\n- \"version\": \"v2.7.2\",\n+ \"version\": \"v2.8.0\",\n\"source\": {\n\"type\": \"git\",\n\"url\": \"https://github.com/doctrine/dbal.git\",\n- \"reference\": \"c0e5736016a51b427a8cba8bc470fbea78165819\"\n+ \"reference\": \"5140a64c08b4b607b9bedaae0cedd26f04a0e621\"\n},\n\"dist\": {\n\"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/doctrine/dbal/zipball/c0e5736016a51b427a8cba8bc470fbea78165819\",\n- \"reference\": \"c0e5736016a51b427a8cba8bc470fbea78165819\",\n+ \"url\": \"https://api.github.com/repos/doctrine/dbal/zipball/5140a64c08b4b607b9bedaae0cedd26f04a0e621\",\n+ \"reference\": \"5140a64c08b4b607b9bedaae0cedd26f04a0e621\",\n\"shasum\": \"\"\n},\n\"require\": {\n- \"doctrine/common\": \"^2.7.1\",\n+ \"doctrine/cache\": \"^1.0\",\n+ \"doctrine/event-manager\": \"^1.0\",\n\"ext-pdo\": \"*\",\n\"php\": \"^7.1\"\n},\n\"require-dev\": {\n\"doctrine/coding-standard\": \"^4.0\",\n- \"phpunit/phpunit\": \"^7.0\",\n+ \"jetbrains/phpstorm-stubs\": \"^2018.1.2\",\n+ \"phpstan/phpstan\": \"^0.10.1\",\n+ \"phpunit/phpunit\": \"^7.1.2\",\n\"phpunit/phpunit-mock-objects\": \"!=3.2.4,!=3.2.5\",\n- \"symfony/console\": \"^2.0.5||^3.0\",\n+ \"symfony/console\": \"^2.0.5|^3.0|^4.0\",\n\"symfony/phpunit-bridge\": \"^3.4.5|^4.0.5\"\n},\n\"suggest\": {\n\"type\": \"library\",\n\"extra\": {\n\"branch-alias\": {\n- \"dev-master\": \"2.7.x-dev\"\n+ \"dev-master\": \"2.8.x-dev\",\n+ \"dev-develop\": \"3.0.x-dev\"\n}\n},\n\"autoload\": {\n\"persistence\",\n\"queryobject\"\n],\n- \"time\": \"2018-07-13T04:49:01+00:00\"\n+ \"time\": \"2018-07-13T03:16:35+00:00\"\n},\n{\n\"name\": \"doctrine/doctrine-bundle\",\n],\n\"time\": \"2017-11-01T09:13:26+00:00\"\n},\n+ {\n+ \"name\": \"doctrine/event-manager\",\n+ \"version\": \"v1.0.0\",\n+ \"source\": {\n+ \"type\": \"git\",\n+ \"url\": \"https://github.com/doctrine/event-manager.git\",\n+ \"reference\": \"a520bc093a0170feeb6b14e9d83f3a14452e64b3\"\n+ },\n+ \"dist\": {\n+ \"type\": \"zip\",\n+ \"url\": \"https://api.github.com/repos/doctrine/event-manager/zipball/a520bc093a0170feeb6b14e9d83f3a14452e64b3\",\n+ \"reference\": \"a520bc093a0170feeb6b14e9d83f3a14452e64b3\",\n+ \"shasum\": \"\"\n+ },\n+ \"require\": {\n+ \"php\": \"^7.1\"\n+ },\n+ \"conflict\": {\n+ \"doctrine/common\": \"<2.9@dev\"\n+ },\n+ \"require-dev\": {\n+ \"doctrine/coding-standard\": \"^4.0\",\n+ \"phpunit/phpunit\": \"^7.0\"\n+ },\n+ \"type\": \"library\",\n+ \"extra\": {\n+ \"branch-alias\": {\n+ \"dev-master\": \"1.0.x-dev\"\n+ }\n+ },\n+ \"autoload\": {\n+ \"psr-4\": {\n+ \"Doctrine\\\\Common\\\\\": \"lib/Doctrine/Common\"\n+ }\n+ },\n+ \"notification-url\": \"https://packagist.org/downloads/\",\n+ \"license\": [\n+ \"MIT\"\n+ ],\n+ \"authors\": [\n+ {\n+ \"name\": \"Roman Borschel\",\n+ \"email\": \"roman@code-factory.org\"\n+ },\n+ {\n+ \"name\": \"Benjamin Eberlei\",\n+ \"email\": \"kontakt@beberlei.de\"\n+ },\n+ {\n+ \"name\": \"Guilherme Blanco\",\n+ \"email\": \"guilhermeblanco@gmail.com\"\n+ },\n+ {\n+ \"name\": \"Jonathan Wage\",\n+ \"email\": \"jonwage@gmail.com\"\n+ },\n+ {\n+ \"name\": \"Johannes Schmitt\",\n+ \"email\": \"schmittjoh@gmail.com\"\n+ },\n+ {\n+ \"name\": \"Marco Pivetta\",\n+ \"email\": \"ocramius@gmail.com\"\n+ }\n+ ],\n+ \"description\": \"Doctrine Event Manager component\",\n+ \"homepage\": \"https://www.doctrine-project.org/projects/event-manager.html\",\n+ \"keywords\": [\n+ \"event\",\n+ \"eventdispatcher\",\n+ \"eventmanager\"\n+ ],\n+ \"time\": \"2018-06-11T11:59:03+00:00\"\n+ },\n{\n\"name\": \"doctrine/inflector\",\n\"version\": \"v1.3.0\",\n},\n{\n\"name\": \"doctrine/orm\",\n- \"version\": \"v2.6.2\",\n+ \"version\": \"v2.6.3\",\n\"source\": {\n\"type\": \"git\",\n\"url\": \"https://github.com/doctrine/doctrine2.git\",\n- \"reference\": \"d2b4dd71d2a276edd65d0c170375b445f8a4a4a8\"\n+ \"reference\": \"434820973cadf2da2d66e7184be370084cc32ca8\"\n},\n\"dist\": {\n\"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/doctrine/doctrine2/zipball/d2b4dd71d2a276edd65d0c170375b445f8a4a4a8\",\n- \"reference\": \"d2b4dd71d2a276edd65d0c170375b445f8a4a4a8\",\n+ \"url\": \"https://api.github.com/repos/doctrine/doctrine2/zipball/434820973cadf2da2d66e7184be370084cc32ca8\",\n+ \"reference\": \"434820973cadf2da2d66e7184be370084cc32ca8\",\n\"shasum\": \"\"\n},\n\"require\": {\n\"database\",\n\"orm\"\n],\n- \"time\": \"2018-07-12T20:47:13+00:00\"\n+ \"time\": \"2018-11-20T23:46:46+00:00\"\n+ },\n+ {\n+ \"name\": \"doctrine/persistence\",\n+ \"version\": \"v1.1.0\",\n+ \"source\": {\n+ \"type\": \"git\",\n+ \"url\": \"https://github.com/doctrine/persistence.git\",\n+ \"reference\": \"c0f1c17602afc18b4cbd8e1c8125f264c9cf7d38\"\n+ },\n+ \"dist\": {\n+ \"type\": \"zip\",\n+ \"url\": \"https://api.github.com/repos/doctrine/persistence/zipball/c0f1c17602afc18b4cbd8e1c8125f264c9cf7d38\",\n+ \"reference\": \"c0f1c17602afc18b4cbd8e1c8125f264c9cf7d38\",\n+ \"shasum\": \"\"\n+ },\n+ \"require\": {\n+ \"doctrine/annotations\": \"^1.0\",\n+ \"doctrine/cache\": \"^1.0\",\n+ \"doctrine/collections\": \"^1.0\",\n+ \"doctrine/event-manager\": \"^1.0\",\n+ \"doctrine/reflection\": \"^1.0\",\n+ \"php\": \"^7.1\"\n+ },\n+ \"conflict\": {\n+ \"doctrine/common\": \"<2.10@dev\"\n+ },\n+ \"require-dev\": {\n+ \"doctrine/coding-standard\": \"^5.0\",\n+ \"phpstan/phpstan\": \"^0.8\",\n+ \"phpunit/phpunit\": \"^7.0\"\n+ },\n+ \"type\": \"library\",\n+ \"extra\": {\n+ \"branch-alias\": {\n+ \"dev-master\": \"1.1.x-dev\"\n+ }\n+ },\n+ \"autoload\": {\n+ \"psr-4\": {\n+ \"Doctrine\\\\Common\\\\\": \"lib/Doctrine/Common\"\n+ }\n+ },\n+ \"notification-url\": \"https://packagist.org/downloads/\",\n+ \"license\": [\n+ \"MIT\"\n+ ],\n+ \"authors\": [\n+ {\n+ \"name\": \"Roman Borschel\",\n+ \"email\": \"roman@code-factory.org\"\n+ },\n+ {\n+ \"name\": \"Benjamin Eberlei\",\n+ \"email\": \"kontakt@beberlei.de\"\n+ },\n+ {\n+ \"name\": \"Guilherme Blanco\",\n+ \"email\": \"guilhermeblanco@gmail.com\"\n+ },\n+ {\n+ \"name\": \"Jonathan Wage\",\n+ \"email\": \"jonwage@gmail.com\"\n+ },\n+ {\n+ \"name\": \"Johannes Schmitt\",\n+ \"email\": \"schmittjoh@gmail.com\"\n+ },\n+ {\n+ \"name\": \"Marco Pivetta\",\n+ \"email\": \"ocramius@gmail.com\"\n+ }\n+ ],\n+ \"description\": \"The Doctrine Persistence project is a set of shared interfaces and functionality that the different Doctrine object mappers share.\",\n+ \"homepage\": \"https://doctrine-project.org/projects/persistence.html\",\n+ \"keywords\": [\n+ \"mapper\",\n+ \"object\",\n+ \"odm\",\n+ \"orm\",\n+ \"persistence\"\n+ ],\n+ \"time\": \"2018-11-21T00:33:13+00:00\"\n+ },\n+ {\n+ \"name\": \"doctrine/reflection\",\n+ \"version\": \"v1.0.0\",\n+ \"source\": {\n+ \"type\": \"git\",\n+ \"url\": \"https://github.com/doctrine/reflection.git\",\n+ \"reference\": \"02538d3f95e88eb397a5f86274deb2c6175c2ab6\"\n+ },\n+ \"dist\": {\n+ \"type\": \"zip\",\n+ \"url\": \"https://api.github.com/repos/doctrine/reflection/zipball/02538d3f95e88eb397a5f86274deb2c6175c2ab6\",\n+ \"reference\": \"02538d3f95e88eb397a5f86274deb2c6175c2ab6\",\n+ \"shasum\": \"\"\n+ },\n+ \"require\": {\n+ \"doctrine/annotations\": \"^1.0\",\n+ \"ext-tokenizer\": \"*\",\n+ \"php\": \"^7.1\"\n+ },\n+ \"require-dev\": {\n+ \"doctrine/coding-standard\": \"^4.0\",\n+ \"doctrine/common\": \"^2.8\",\n+ \"phpstan/phpstan\": \"^0.9.2\",\n+ \"phpstan/phpstan-phpunit\": \"^0.9.4\",\n+ \"phpunit/phpunit\": \"^7.0\",\n+ \"squizlabs/php_codesniffer\": \"^3.0\"\n+ },\n+ \"type\": \"library\",\n+ \"extra\": {\n+ \"branch-alias\": {\n+ \"dev-master\": \"1.0.x-dev\"\n+ }\n+ },\n+ \"autoload\": {\n+ \"psr-4\": {\n+ \"Doctrine\\\\Common\\\\\": \"lib/Doctrine/Common\"\n+ }\n+ },\n+ \"notification-url\": \"https://packagist.org/downloads/\",\n+ \"license\": [\n+ \"MIT\"\n+ ],\n+ \"authors\": [\n+ {\n+ \"name\": \"Roman Borschel\",\n+ \"email\": \"roman@code-factory.org\"\n+ },\n+ {\n+ \"name\": \"Benjamin Eberlei\",\n+ \"email\": \"kontakt@beberlei.de\"\n+ },\n+ {\n+ \"name\": \"Guilherme Blanco\",\n+ \"email\": \"guilhermeblanco@gmail.com\"\n+ },\n+ {\n+ \"name\": \"Jonathan Wage\",\n+ \"email\": \"jonwage@gmail.com\"\n+ },\n+ {\n+ \"name\": \"Johannes Schmitt\",\n+ \"email\": \"schmittjoh@gmail.com\"\n+ },\n+ {\n+ \"name\": \"Marco Pivetta\",\n+ \"email\": \"ocramius@gmail.com\"\n+ }\n+ ],\n+ \"description\": \"Doctrine Reflection component\",\n+ \"homepage\": \"https://www.doctrine-project.org/projects/reflection.html\",\n+ \"keywords\": [\n+ \"reflection\"\n+ ],\n+ \"time\": \"2018-06-14T14:45:07+00:00\"\n},\n{\n\"name\": \"easycorp/easy-log-handler\",\n},\n{\n\"name\": \"nesbot/carbon\",\n- \"version\": \"1.35.1\",\n+ \"version\": \"1.36.0\",\n\"source\": {\n\"type\": \"git\",\n\"url\": \"https://github.com/briannesbitt/Carbon.git\",\n- \"reference\": \"5c05a2be472b22f63291d192410df9f0e0de3b19\"\n+ \"reference\": \"f5e9fa283fa389ffa49e58391a02f063dcdd1815\"\n},\n\"dist\": {\n\"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/briannesbitt/Carbon/zipball/5c05a2be472b22f63291d192410df9f0e0de3b19\",\n- \"reference\": \"5c05a2be472b22f63291d192410df9f0e0de3b19\",\n+ \"url\": \"https://api.github.com/repos/briannesbitt/Carbon/zipball/f5e9fa283fa389ffa49e58391a02f063dcdd1815\",\n+ \"reference\": \"f5e9fa283fa389ffa49e58391a02f063dcdd1815\",\n\"shasum\": \"\"\n},\n\"require\": {\n\"datetime\",\n\"time\"\n],\n- \"time\": \"2018-11-14T21:55:58+00:00\"\n+ \"time\": \"2018-11-16T11:47:11+00:00\"\n},\n{\n\"name\": \"nikic/php-parser\",\n},\n{\n\"name\": \"psr/log\",\n- \"version\": \"1.0.2\",\n+ \"version\": \"1.1.0\",\n\"source\": {\n\"type\": \"git\",\n\"url\": \"https://github.com/php-fig/log.git\",\n- \"reference\": \"4ebe3a8bf773a19edfe0a84b6585ba3d401b724d\"\n+ \"reference\": \"6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd\"\n},\n\"dist\": {\n\"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d\",\n- \"reference\": \"4ebe3a8bf773a19edfe0a84b6585ba3d401b724d\",\n+ \"url\": \"https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd\",\n+ \"reference\": \"6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd\",\n\"shasum\": \"\"\n},\n\"require\": {\n\"psr\",\n\"psr-3\"\n],\n- \"time\": \"2016-10-10T12:19:37+00:00\"\n+ \"time\": \"2018-11-20T15:27:04+00:00\"\n},\n{\n\"name\": \"psr/simple-cache\",\n},\n{\n\"name\": \"symplify/better-phpdoc-parser\",\n- \"version\": \"v5.2.3\",\n+ \"version\": \"v5.2.6\",\n\"source\": {\n\"type\": \"git\",\n\"url\": \"https://github.com/Symplify/BetterPhpDocParser.git\",\n- \"reference\": \"bd43b4b833a301a227773a99e5d3f03654114ea9\"\n+ \"reference\": \"dc2449cf36a5bd3e6370c3f06790d4f13a2bcade\"\n},\n\"dist\": {\n\"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/Symplify/BetterPhpDocParser/zipball/bd43b4b833a301a227773a99e5d3f03654114ea9\",\n- \"reference\": \"bd43b4b833a301a227773a99e5d3f03654114ea9\",\n+ \"url\": \"https://api.github.com/repos/Symplify/BetterPhpDocParser/zipball/dc2449cf36a5bd3e6370c3f06790d4f13a2bcade\",\n+ \"reference\": \"dc2449cf36a5bd3e6370c3f06790d4f13a2bcade\",\n\"shasum\": \"\"\n},\n\"require\": {\n\"nette/utils\": \"^2.5\",\n\"php\": \"^7.1\",\n\"phpstan/phpdoc-parser\": \"^0.3\",\n- \"symplify/package-builder\": \"^5.2.3\",\n+ \"symplify/package-builder\": \"^5.2.6\",\n\"thecodingmachine/safe\": \"^0.1.6\"\n},\n\"require-dev\": {\n\"MIT\"\n],\n\"description\": \"Slim wrapper around phpstan/phpdoc-parser with format preserving printer\",\n- \"time\": \"2018-11-15T22:16:25+00:00\"\n+ \"time\": \"2018-11-21T16:31:34+00:00\"\n},\n{\n\"name\": \"symplify/coding-standard\",\n- \"version\": \"v5.2.3\",\n+ \"version\": \"v5.2.6\",\n\"source\": {\n\"type\": \"git\",\n\"url\": \"https://github.com/Symplify/CodingStandard.git\",\n- \"reference\": \"122c7ce634358dfef6c8bcc4822c3b0c3b61e587\"\n+ \"reference\": \"7c2f63160f812800ebdef2aacdf2e9ffa6bf6d11\"\n},\n\"dist\": {\n\"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/Symplify/CodingStandard/zipball/122c7ce634358dfef6c8bcc4822c3b0c3b61e587\",\n- \"reference\": \"122c7ce634358dfef6c8bcc4822c3b0c3b61e587\",\n+ \"url\": \"https://api.github.com/repos/Symplify/CodingStandard/zipball/7c2f63160f812800ebdef2aacdf2e9ffa6bf6d11\",\n+ \"reference\": \"7c2f63160f812800ebdef2aacdf2e9ffa6bf6d11\",\n\"shasum\": \"\"\n},\n\"require\": {\n\"php\": \"^7.1\",\n\"slam/php-cs-fixer-extensions\": \"^1.17\",\n\"squizlabs/php_codesniffer\": \"^3.3\",\n- \"symplify/token-runner\": \"^5.2.3\",\n+ \"symplify/token-runner\": \"^5.2.6\",\n\"thecodingmachine/safe\": \"^0.1.6\"\n},\n\"require-dev\": {\n\"nette/application\": \"^2.4\",\n\"phpunit/phpunit\": \"^7.3\",\n- \"symplify/easy-coding-standard-tester\": \"^5.2.3\",\n- \"symplify/package-builder\": \"^5.2.3\"\n+ \"symplify/easy-coding-standard-tester\": \"^5.2.6\",\n+ \"symplify/package-builder\": \"^5.2.6\"\n},\n\"type\": \"library\",\n\"extra\": {\n\"MIT\"\n],\n\"description\": \"Set of Symplify rules for PHP_CodeSniffer and PHP CS Fixer.\",\n- \"time\": \"2018-11-15T22:16:25+00:00\"\n+ \"time\": \"2018-11-21T16:31:34+00:00\"\n},\n{\n\"name\": \"symplify/easy-coding-standard\",\n- \"version\": \"v5.2.3\",\n+ \"version\": \"v5.2.6\",\n\"source\": {\n\"type\": \"git\",\n\"url\": \"https://github.com/Symplify/EasyCodingStandard.git\",\n- \"reference\": \"d0ba57c2ffdfd4989ff2c184d114a3b032325628\"\n+ \"reference\": \"64dd219fd7274da56ed3846deb7b63f71808462e\"\n},\n\"dist\": {\n\"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/Symplify/EasyCodingStandard/zipball/d0ba57c2ffdfd4989ff2c184d114a3b032325628\",\n- \"reference\": \"d0ba57c2ffdfd4989ff2c184d114a3b032325628\",\n+ \"url\": \"https://api.github.com/repos/Symplify/EasyCodingStandard/zipball/64dd219fd7274da56ed3846deb7b63f71808462e\",\n+ \"reference\": \"64dd219fd7274da56ed3846deb7b63f71808462e\",\n\"shasum\": \"\"\n},\n\"require\": {\n\"symfony/finder\": \"^3.4|^4.1\",\n\"symfony/http-kernel\": \"^3.4|^4.1\",\n\"symfony/yaml\": \"^3.4|^4.1\",\n- \"symplify/coding-standard\": \"^5.2.3\",\n- \"symplify/package-builder\": \"^5.2.3\",\n- \"symplify/token-runner\": \"^5.2.3\",\n+ \"symplify/coding-standard\": \"^5.2.6\",\n+ \"symplify/package-builder\": \"^5.2.6\",\n+ \"symplify/token-runner\": \"^5.2.6\",\n\"thecodingmachine/safe\": \"^0.1.6\"\n},\n\"require-dev\": {\n\"phpunit/phpunit\": \"^7.3\",\n- \"symplify/easy-coding-standard-tester\": \"^5.2.3\"\n+ \"symplify/easy-coding-standard-tester\": \"^5.2.6\"\n},\n\"bin\": [\n\"bin/ecs\"\n\"MIT\"\n],\n\"description\": \"Use Coding Standard with 0-knowledge of PHP-CS-Fixer and PHP_CodeSniffer.\",\n- \"time\": \"2018-11-15T22:16:25+00:00\"\n+ \"time\": \"2018-11-21T16:31:34+00:00\"\n},\n{\n\"name\": \"symplify/package-builder\",\n- \"version\": \"v5.2.3\",\n+ \"version\": \"v5.2.6\",\n\"source\": {\n\"type\": \"git\",\n\"url\": \"https://github.com/Symplify/PackageBuilder.git\",\n- \"reference\": \"892556b107710af0df718436917bcfa421745663\"\n+ \"reference\": \"490cd720081a14569dcc32202b30cd804cd70569\"\n},\n\"dist\": {\n\"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/Symplify/PackageBuilder/zipball/892556b107710af0df718436917bcfa421745663\",\n- \"reference\": \"892556b107710af0df718436917bcfa421745663\",\n+ \"url\": \"https://api.github.com/repos/Symplify/PackageBuilder/zipball/490cd720081a14569dcc32202b30cd804cd70569\",\n+ \"reference\": \"490cd720081a14569dcc32202b30cd804cd70569\",\n\"shasum\": \"\"\n},\n\"require\": {\n\"MIT\"\n],\n\"description\": \"Dependency Injection, Console and Kernel toolkit for Symplify packages.\",\n- \"time\": \"2018-11-15T21:42:37+00:00\"\n+ \"time\": \"2018-11-20T17:04:29+00:00\"\n},\n{\n\"name\": \"symplify/token-runner\",\n- \"version\": \"v5.2.3\",\n+ \"version\": \"v5.2.6\",\n\"source\": {\n\"type\": \"git\",\n\"url\": \"https://github.com/Symplify/TokenRunner.git\",\n- \"reference\": \"e2b0696bc760f1b69e7b442642e298d4c377a81f\"\n+ \"reference\": \"807c28a1c1624e0ad6c0388be250cade0d49418c\"\n},\n\"dist\": {\n\"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/Symplify/TokenRunner/zipball/e2b0696bc760f1b69e7b442642e298d4c377a81f\",\n- \"reference\": \"e2b0696bc760f1b69e7b442642e298d4c377a81f\",\n+ \"url\": \"https://api.github.com/repos/Symplify/TokenRunner/zipball/807c28a1c1624e0ad6c0388be250cade0d49418c\",\n+ \"reference\": \"807c28a1c1624e0ad6c0388be250cade0d49418c\",\n\"shasum\": \"\"\n},\n\"require\": {\n\"nette/utils\": \"^2.5\",\n\"php\": \"^7.1\",\n\"squizlabs/php_codesniffer\": \"^3.3\",\n- \"symplify/better-phpdoc-parser\": \"^5.2.3\",\n- \"symplify/package-builder\": \"^5.2.3\",\n+ \"symplify/better-phpdoc-parser\": \"^5.2.6\",\n+ \"symplify/package-builder\": \"^5.2.6\",\n\"thecodingmachine/safe\": \"^0.1.6\"\n},\n\"require-dev\": {\n\"MIT\"\n],\n\"description\": \"Set of utils for PHP_CodeSniffer and PHP CS Fixer.\",\n- \"time\": \"2018-11-15T22:16:25+00:00\"\n+ \"time\": \"2018-11-21T16:31:34+00:00\"\n},\n{\n\"name\": \"thecodingmachine/safe\",\n"
},
{
"change_type": "MODIFY",
"old_path": "symfony.lock",
"new_path": "symfony.lock",
"diff": "\"ref\": \"c1431086fec31f17fbcfe6d6d7e92059458facc1\"\n}\n},\n+ \"doctrine/event-manager\": {\n+ \"version\": \"v1.0.0\"\n+ },\n\"doctrine/inflector\": {\n\"version\": \"v1.2.0\"\n},\n\"doctrine/orm\": {\n\"version\": \"v2.5.12\"\n},\n+ \"doctrine/persistence\": {\n+ \"version\": \"v1.1.0\"\n+ },\n+ \"doctrine/reflection\": {\n+ \"version\": \"v1.0.0\"\n+ },\n\"easycorp/easy-log-handler\": {\n\"version\": \"1.0\",\n\"recipe\": {\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Update composer (to fix Travis)
|
95,144 |
23.11.2018 12:34:06
| -3,600 |
c5bde2b7d03c396b47922d5d5717a02a1bbd281a
|
Throw Exception instead of die()-ing.
|
[
{
"change_type": "MODIFY",
"old_path": "src/Content/MediaFactory.php",
"new_path": "src/Content/MediaFactory.php",
"diff": "@@ -52,6 +52,9 @@ class MediaFactory\n$this->mediatypes = $config->getMediaTypes();\n}\n+ /**\n+ * @throws \\Exception\n+ */\npublic function createOrUpdateMedia(SplFileInfo $file, string $area): Media\n{\n$media = $this->mediaRepository->findOneBy([\n@@ -68,7 +71,8 @@ class MediaFactory\n}\nif (! $this->mediatypes->contains($file->getExtension())) {\n- die('Not a valid media type.');\n+ // Todo: We're throwing a generic Exception here. Needs to be handled better.\n+ throw new \\Exception('Not a valid media type.');\n}\n$media->setType($file->getExtension())\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Throw Exception instead of die()-ing.
|
95,144 |
23.11.2018 12:56:06
| -3,600 |
d83ceb0a561fa63fcf62f2c300268b8c845dec57
|
Keep `@todo` formatting consistent.
|
[
{
"change_type": "MODIFY",
"old_path": "src/Content/MediaFactory.php",
"new_path": "src/Content/MediaFactory.php",
"diff": "@@ -71,7 +71,7 @@ class MediaFactory\n}\nif (! $this->mediatypes->contains($file->getExtension())) {\n- // Todo: We're throwing a generic Exception here. Needs to be handled better.\n+ // @todo We're throwing a generic Exception here. Needs to be handled better.\nthrow new \\Exception('Not a valid media type.');\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Async/News.php",
"new_path": "src/Controller/Async/News.php",
"diff": "@@ -36,7 +36,7 @@ final class News\n{\n$news = $this->getNews($request->getHost());\n- // Todo: Make sure this works as intended\n+ // @todo Make sure this works as intended\nif ($this->config->get('news') !== false) {\nreturn new JsonResponse([], 200);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Frontend/HomepageController.php",
"new_path": "src/Controller/Frontend/HomepageController.php",
"diff": "@@ -33,7 +33,7 @@ class HomepageController extends BaseController\n$homepage = $this->getOption('theme/homepage') ?: $this->getOption('general/homepage');\n$params = explode('/', $homepage);\n- // todo get $homepage content, using \"setcontent\"\n+ // @todo Get $homepage content, using \"setcontent\"\n$record = $contentRepository->findOneBy([\n'contentType' => $params[0],\n'id' => $params[1],\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Frontend/PreviewController.php",
"new_path": "src/Controller/Frontend/PreviewController.php",
"diff": "@@ -28,7 +28,7 @@ class PreviewController extends BaseController\n{\n$homepage = $this->getOption('theme/homepage') ?: $this->getOption('general/homepage');\n- // todo get $homepage content.\n+ // @todo Get $homepage content.\n$twigvars = [\n'record' => $homepage,\n];\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Entity/Content.php",
"new_path": "src/Entity/Content.php",
"diff": "@@ -36,9 +36,9 @@ class Content\n{\nuse ContentMagicTraits;\n- public const NUM_ITEMS = 8; // @todo this can't be a const\n+ public const NUM_ITEMS = 8; // @todo This can't be a const\n- public const STATUSES = ['published', 'held', 'timed', 'draft']; // @todo move to Enum\n+ public const STATUSES = ['published', 'held', 'timed', 'draft']; // @todo Move to Enum\n/**\n* @ORM\\Id()\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Keep `@todo` formatting consistent.
|
95,144 |
24.11.2018 18:24:20
| -3,600 |
77770d7d0bb5577626e6395d6e7b8289f4e2408c
|
Getting more work done!
|
[
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/ContentEditController.php",
"new_path": "src/Controller/Backend/ContentEditController.php",
"diff": "@@ -103,7 +103,7 @@ class ContentEditController extends BaseController\n$field = $content->getLocalisedField($key, $locale);\n} else {\n$fields = collect($content->getDefinition()->get('fields'));\n- $field = Field::factory($fields->get($key)['type']);\n+ $field = Field::factory($fields->get($key), $key);\n$field->setName($key);\n$content->addField($field);\n}\n@@ -117,10 +117,9 @@ class ContentEditController extends BaseController\n}\n}\n-\nprivate function getEditLocale(Request $request, Content $content): string\n{\n- $locale = $request->query->get('locale');\n+ $locale = $request->query->get('locale', '');\n$locales = $content->getLocales();\nif (! $locales->contains($locale)) {\n@@ -130,12 +129,8 @@ class ContentEditController extends BaseController\nreturn $locale;\n}\n-\nprivate function getPostedLocale(array $post): string\n{\n- $locale = $post['_edit_locale'] ?: '';\n-\n- return $locale;\n+ return $post['_edit_locale'] ?: '';\n}\n-\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/ContentLocalisationController.php",
"new_path": "src/Controller/Backend/ContentLocalisationController.php",
"diff": "@@ -6,17 +6,10 @@ namespace Bolt\\Controller\\Backend;\nuse Bolt\\Controller\\BaseController;\nuse Bolt\\Entity\\Content;\n-use Bolt\\Entity\\Field;\n-use Carbon\\Carbon;\n-use Doctrine\\Common\\Persistence\\ObjectManager;\nuse Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\Security;\n-use Symfony\\Component\\HttpFoundation\\RedirectResponse;\nuse Symfony\\Component\\HttpFoundation\\Request;\nuse Symfony\\Component\\HttpFoundation\\Response;\nuse Symfony\\Component\\Routing\\Annotation\\Route;\n-use Symfony\\Component\\Routing\\Generator\\UrlGeneratorInterface;\n-use Symfony\\Component\\Security\\Core\\Exception\\InvalidCsrfTokenException;\n-use Symfony\\Component\\Security\\Csrf\\CsrfToken;\n/**\n* Class ContentLocalisationController.\n@@ -28,10 +21,6 @@ class ContentLocalisationController extends BaseController\n/**\n* @Route(\"/edit_locales/{id}\", name=\"bolt_content_edit_locales\", methods={\"GET\"})\n*\n- * @param string $id\n- * @param Request $request\n- * @param Content $content\n- * @return Response\n* @throws \\Twig_Error_Loader\n* @throws \\Twig_Error_Runtime\n* @throws \\Twig_Error_Syntax\n@@ -41,12 +30,11 @@ class ContentLocalisationController extends BaseController\ndump($content);\n// die();\n- /** Content $content */\n+ /* Content $content */\n$content->getFields();\nreturn $this->renderTemplate('content/view_locales.html.twig', [\n'record' => $content,\n]);\n}\n-\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/DataFixtures/ContentFixtures.php",
"new_path": "src/DataFixtures/ContentFixtures.php",
"diff": "@@ -62,7 +62,7 @@ class ContentFixtures extends Fixture implements DependentFixtureInterface\n$sortorder = 1;\nforeach ($contentType['fields'] as $name => $fieldType) {\n- $field = Field::factory($fieldType['type']);\n+ $field = Field::factory($fieldType, $name);\n$field->setName($name);\n$field->setValue($this->getValuesforFieldType($name, $fieldType));\n$field->setSortorder($sortorder++ * 5);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Entity/ContentLocaliseTraits.php",
"new_path": "src/Entity/ContentLocaliseTraits.php",
"diff": "@@ -4,13 +4,16 @@ declare(strict_types=1);\nnamespace Bolt\\Entity;\n-trait ContentMagicTraits\n+trait ContentLocaliseTraits\n{\n-\npublic function getLocales()\n{\n$locales = $this->getDefinition()->get('locales');\n+ if (empty($locales)) {\n+ $locales = [''];\n+ }\n+\nreturn collect($locales);\n}\n@@ -19,7 +22,6 @@ trait ContentMagicTraits\nreturn $this->getLocales()->first();\n}\n-\n/**\n* @return Collection|Field[]\n*/\n@@ -39,9 +41,10 @@ trait ContentMagicTraits\nreturn $fields;\n}\n- public function hasLocalisedField(string $name, string $locale = '') {\n+ public function hasLocalisedField(string $name, string $locale = '')\n+ {\nforeach ($this->fields as $field) {\n- if ($field->getName() == $name && in_array($field->getLocale(), [$locale, ''])) {\n+ if ($field->getName() === $name && in_array($field->getLocale(), [$locale, ''], true)) {\nreturn true;\n}\n}\n@@ -53,7 +56,7 @@ trait ContentMagicTraits\n{\n// First, see if we have the field, in the correct locale\nforeach ($this->fields as $field) {\n- if ($field->getName() == $name && in_array($field->getLocale(), [$locale, ''])) {\n+ if ($field->getName() === $name && in_array($field->getLocale(), [$locale, ''], true)) {\nreturn $field;\n}\n}\n@@ -61,7 +64,7 @@ trait ContentMagicTraits\n// Second, see if we have the field, in the fallback locale\nif ($fallback) {\nforeach ($this->fields as $field) {\n- if ($field->getName() == $name && $field->getLocale() == $this->getDefaultLocale()) {\n+ if ($field->getName() === $name && $field->getLocale() === $this->getDefaultLocale()) {\nreturn $field;\n}\n}\n@@ -69,11 +72,10 @@ trait ContentMagicTraits\n// Third, see if we can create the field on the fly\nif (! empty($definition)) {\n- return Field::factory($definition['type'], $name, $definition);\n+ return Field::factory($definition, $name);\n}\n// Alas, return an empty array\nreturn [];\n}\n-\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Entity/ContentMagicTraits.php",
"new_path": "src/Entity/ContentMagicTraits.php",
"diff": "@@ -46,13 +46,15 @@ trait ContentMagicTraits\n}\n}\n- public function get(string $name): Field\n+ public function get(string $name): ?Field\n{\nforeach ($this->fields as $field) {\nif ($field->getName() === $name) {\nreturn $field;\n}\n}\n+\n+ return null;\n}\npublic function has(string $name): bool\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Entity/Field.php",
"new_path": "src/Entity/Field.php",
"diff": "@@ -122,8 +122,10 @@ class Field\n/**\n* @return Field\n*/\n- public static function factory(string $type = 'generic', string $name = '', array $definition = []): self\n+ public static function factory(array $definition, string $name = ''): self\n{\n+ $type = $definition['type'];\n+\n$classname = '\\\\Bolt\\\\Entity\\\\Field\\\\' . ucwords($type) . 'Field';\nif (class_exists($classname)) {\n$field = new $classname();\n@@ -135,9 +137,7 @@ class Field\n$field->setName($name);\n}\n- if (!empty($definition)) {\n$field->setDefinition($type, $definition);\n- }\nreturn $field;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/ContentHelperExtension.php",
"new_path": "src/Twig/ContentHelperExtension.php",
"diff": "@@ -68,15 +68,6 @@ class ContentHelperExtension extends AbstractExtension\nreturn $this->menu;\n}\n- public function fieldfactory($name, $definition)\n- {\n- $field = Field::factory($definition['type']);\n- $field->setName($name);\n- $field->setDefinition($name, $definition);\n-\n- return $field;\n- }\n-\npublic function icon($record, $icon = 'question-circle')\n{\nif ($record instanceof Content) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/LocaleExtension.php",
"new_path": "src/Twig/LocaleExtension.php",
"diff": "@@ -97,15 +97,13 @@ class LocaleExtension extends AbstractExtension\n{\n$locale = $this->localeInfo($localeCode);\n- $html = sprintf(\n+ return sprintf(\n'<span class=\"fp mr-1 %s\" title=\"%s - %s / %s\"></span>',\n$locale->get('flag'),\n$locale->get('name'),\n$locale->get('localisedname'),\n$locale->get('code')\n);\n-\n- return $html;\n}\nprivate function localeInfo($localeCode)\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Getting more work done!
|
95,144 |
25.11.2018 18:07:42
| -3,600 |
a086af0561e0816268afd006b3a18e7c5123b8f7
|
Clean up labels, postfix and prefix
|
[
{
"change_type": "DELETE",
"old_path": "assets/js/app/editor/Components/Editor/_Partials/Helper.vue",
"new_path": "assets/js/app/editor/Components/Editor/_Partials/Helper.vue",
"diff": ""
},
{
"change_type": "DELETE",
"old_path": "assets/js/app/editor/Components/Editor/_Partials/Label.vue",
"new_path": null,
"diff": "-<template>\n- <label :for=\"forlabel\">{{label}}</label>\n-</template>\n-\n-<script>\n- export default {\n- name: \"editor-label\",\n- props: ['label', 'forlabel']\n- };\n-</script>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/_base.html.twig",
"new_path": "templates/_partials/fields/_base.html.twig",
"diff": "<!-- field \" {{ type }} {{ variant }} {{ label }} {{ name }} -->\n<div class=\"form-group editor--group is-{{variant}}\">\n-{% if prefix %}\n- {% include '_partials/fields/_partials/_helper.html.twig' with { type: 'prefix', message: prefix} %}\n-{% endif %}\n+{{ prefix|raw }}\n{% block label %}\n- {% include '_partials/fields/_partials/_label.html.twig' %}\n+ {% include '_partials/fields/_label.html.twig' %}\n{% endblock %}\n{% block field %}\n{% endblock %}\n-{% if postfix %}\n- {% include '_partials/fields/_partials/_helper.html.twig' with { type: 'postfix', message: postfix} %}\n-{% endif %}\n+{{ postfix|raw }}\n</div>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "templates/_partials/fields/_label.html.twig",
"diff": "+{% if type != 'checkbox' %}\n+ <label for=\"{{ id }}\">\n+ {% if localise %}\n+ <i class=\"fas fa-language\"></i>\n+ {% endif %}\n+ {{ label }}\n+ </label>\n+{% endif %}\n+\n"
},
{
"change_type": "DELETE",
"old_path": "templates/_partials/fields/_partials/_helper.html.twig",
"new_path": null,
"diff": "-{# {{type}}\n-{{message}} #}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "templates/_partials/fields/_partials/_label.html.twig",
"new_path": null,
"diff": "-{% if type != 'checkbox' %}\n- {% if localise %}\n- <i class=\"fas fa-language\"></i>\n- {% endif %}\n- <editor-label forlabel=\"{{ id }}\" label=\"{{ label }}\"></editor-label>\n-{% endif %}\n-\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Clean up labels, postfix and prefix
|
95,168 |
26.11.2018 16:51:43
| -3,600 |
2ec16aa9f2f76ddd2b6ded9a89f2ca6825c14994
|
Remove TODOs in login.html.twig
|
[
{
"change_type": "MODIFY",
"old_path": "templates/security/login.html.twig",
"new_path": "templates/security/login.html.twig",
"diff": "{% endif %}\n<form action=\"{{ path('bolt_login') }}\" method=\"post\" class=\"\" id=\"login-form\">\n- {# TODO: Add _target_path hidden input as Vue Component #}\n<input type=\"hidden\" name=\"_target_path\" value=\"{{ app.request.get('redirect_to') }}\"/>\n- {# TODO: Add _csrf_token hidden input as Vue Component #}\n<input type=\"hidden\" name=\"_csrf_token\" value=\"{{ csrf_token('authenticate') }}\"/>\n{% include '@bolt/_partials/fields/text.html.twig' with {\n'label' : 'label.fullname'|trans,\n'value': '',\n'class': 'form-control',\n} %}\n- {# TODO: Add remember me checkbox as Vue Component #}\n<div class=\"form-group form-check\">\n<input type=\"checkbox\" class=\"form-check-input\" name=\"_remember_me\" id=\"_remember_me\">\n<label class=\"form-check-label\" for=\"_remember_me\">{{ 'label.rememberme'|trans }}</label>\n</div>\n- {# TODO: Add submit button as Vue Component #}\n<button type=\"submit\" class=\"btn btn-primary\">\n<i class=\"fas fa-sign-in-alt\" aria-hidden=\"true\"></i>\n{{ 'action.log_in'|trans }}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Remove TODOs in login.html.twig
|
95,144 |
26.11.2018 17:41:33
| -3,600 |
2091921b5741b8008b6ae95414f47a55180f80fc
|
Updating link to security checker to security.symfony.com
|
[
{
"change_type": "MODIFY",
"old_path": ".travis.yml",
"new_path": ".travis.yml",
"diff": "@@ -42,7 +42,7 @@ script:\n# this checks that the XLIFF translations contain no syntax errors\n- ./bin/console lint:xliff translations\n# this checks that the application doesn't use dependencies with known security vulnerabilities\n- - ./bin/console security:check --end-point=http://security.sensiolabs.org/check_lock\n+ - ./bin/console security:check --end-point=http://security.symfony.com/check_lock\n# this checks that the composer.json and composer.lock files are valid\n- composer validate --strict\n# this checks that Doctrine's mapping configurations are valid\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Updating link to security checker to security.symfony.com
|
95,144 |
26.11.2018 20:38:54
| -3,600 |
a301c677c8cc2c99ef0e1facbb7f7942a8296338
|
Updating travis again, no url needed.
|
[
{
"change_type": "MODIFY",
"old_path": ".travis.yml",
"new_path": ".travis.yml",
"diff": "@@ -42,7 +42,7 @@ script:\n# this checks that the XLIFF translations contain no syntax errors\n- ./bin/console lint:xliff translations\n# this checks that the application doesn't use dependencies with known security vulnerabilities\n- - ./bin/console security:check --end-point=http://security.symfony.com/check_lock\n+ - ./bin/console security:check\n# this checks that the composer.json and composer.lock files are valid\n- composer validate --strict\n# this checks that Doctrine's mapping configurations are valid\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Updating travis again, no url needed.
|
95,132 |
27.11.2018 10:45:22
| -3,600 |
ea9ef0fed727cd6f4b0a78351aff49d5c4af0952
|
Remove references to Label component
|
[
{
"change_type": "MODIFY",
"old_path": "assets/js/Views/user.js",
"new_path": "assets/js/Views/user.js",
"diff": "@@ -6,7 +6,6 @@ import Theme from \"../Components/User/Theme\";\nimport Password from \"../Components/Password/Password\";\nimport Email from \"../Components/Email/Email\";\nimport Text from \"../app/editor/Components/Editor/Text/Text\";\n-import Label from \"../app/editor/Components/Editor/_Partials/Label\";\n/**\n* Register Components\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/Editor/index.js",
"new_path": "assets/js/app/editor/Components/Editor/index.js",
"diff": "@@ -13,8 +13,6 @@ import Textarea from './Textarea/Textarea';\nimport Image from './Image/Image';\n-import Label from './_Partials/Label'\n-\nexport {\nText,\n@@ -25,6 +23,5 @@ export {\nHtml,\nMarkdown,\nTextarea,\n- Image,\n- Label\n+ Image\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/index.js",
"new_path": "assets/js/app/editor/index.js",
"diff": "@@ -15,8 +15,7 @@ import {\nHtml,\nMarkdown,\nTextarea,\n- Image,\n- Label\n+ Image\n} from './Components/Editor';\nimport {\n@@ -38,7 +37,6 @@ new Vue({\n\"editor-html\": Html,\n\"editor-markdown\": Markdown,\n\"editor-textarea\": Textarea,\n- \"editor-image\": Image,\n- \"editor-label\": Label\n+ \"editor-image\": Image\n}\n});\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Remove references to Label component
|
95,132 |
27.11.2018 11:58:29
| -3,600 |
882bcd03b6def1814e33be1d0f05a46e52c45392
|
Remove references to `editor-label` component
|
[
{
"change_type": "MODIFY",
"old_path": "assets/js/Views/editor.js",
"new_path": "assets/js/Views/editor.js",
"diff": "@@ -29,7 +29,5 @@ Vue.component(\"editor-image\", Image);\n/**\n* Register Partial Components\n*/\n-Vue.component(\"editor-label\", Label);\n-\nnew Vue({ el: \"#editcontent\", name: \"admin-editor\" });\nnew Vue({ el: \"#metadata\", name: \"admin-meta\" });\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/js/Views/user.js",
"new_path": "assets/js/Views/user.js",
"diff": "@@ -14,7 +14,6 @@ Vue.component(\"user-theme\", Theme);\nVue.component(\"field-password\", Password);\nVue.component(\"field-email\", Email);\nVue.component(\"editor-text\", Text);\n-Vue.component(\"editor-label\", Label);\nnew Vue({\nel: \"#login-form\",\n@@ -22,7 +21,6 @@ new Vue({\ncomponents: {\n\"editor-text\": Text,\n\"field-password\": Password,\n- \"editor-label\": Label\n}\n})\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Remove references to `editor-label` component
|
95,144 |
27.11.2018 12:34:07
| -3,600 |
9130b138a35d884d3fda2cb7ab3e02073e6a79d2
|
Making fixtures work again
|
[
{
"change_type": "MODIFY",
"old_path": "src/DataFixtures/ContentFixtures.php",
"new_path": "src/DataFixtures/ContentFixtures.php",
"diff": "@@ -49,7 +49,8 @@ class ContentFixtures extends Fixture implements DependentFixtureInterface\n$amount = $contentType['singleton'] ? 1 : 15;\nforeach (range(1, $amount) as $i) {\n- $author = $this->getReference($i === ['jane_admin', 'tom_admin'][0 ?: random_int(0, 1)]);\n+ $ref = $i === 0 ? 'admin' : ['admin', 'henkie', 'jane_admin', 'tom_admin'][random_int(0, 3)];\n+ $author = $this->getReference($ref);\n$content = new Content();\n$content->setContenttype($contentType['slug']);\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Making fixtures work again
|
95,144 |
28.11.2018 17:38:15
| -3,600 |
2ea31c91fb33e167c0e0ec7bb797b823a075b267
|
Update number.html.twig
|
[
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/number.html.twig",
"new_path": "templates/_partials/fields/number.html.twig",
"diff": "{# set step #}\n{% if step is not defined and mode == 'integer' %}\n{% set step = define.step|default(0.5) %}\n- {% else %}\n+ {% elseif mode == 'integer' %}\n{% set step = 1 %}\n+ {% else %}\n+ {% set step = 0 %}\n{% endif %}\n+ {% set value = value|number_format(32) %}\n+\n<editor-number\nname=\"{{ name }}\"\n:value=\"{{ value }}\"\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Update number.html.twig
|
95,144 |
29.11.2018 13:04:43
| -3,600 |
e585eb705cdcc303a76d5bc3110302cf62ba586e
|
Update 'linuxy' to 'UNIX-like'
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -26,7 +26,7 @@ To install Bolt 4 (for now):\n- Run `composer install`\n- Run `npm install && npm run build`\n-Alternatively, run `make install`, on a Linuxy system.\n+Alternatively, run `make install`, on a UNIX-like system.\nIt's on the roadmap for Beta 1 to provide a `composer create-project` install.\n@@ -43,7 +43,7 @@ bin/console doctrine:schema:create\nbin/console doctrine:fixtures:load -n\n```\n-Alternatively, run `make db-create`, on a Linuxy system.\n+Alternatively, run `make db-create`, on a UNIX-like system.\nRe-set the Database\n-------------------\n@@ -58,7 +58,7 @@ bin/console doctrine:schema:create\nbin/console doctrine:fixtures:load -n\n```\n-Alternatively, run `make db-reset`, on a Linuxy system.\n+Alternatively, run `make db-reset`, on a UNIX-like system.\nRun the prototype\n-----------------\n@@ -86,7 +86,8 @@ See the other options by running `npm run`.\nCode Style / Static Analysis\n----------------------------\n-Run the following commands with `make`, to perform Code Style checking and automatic fixing:\n+Run the following commands with `make`, to perform Code Style checking and\n+automatic fixing:\n- `make cscheck`: Run ECS and PHPStan\n- `make cscheck`: Run ECS, perform automatic fixes and run PHPStan\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Update 'linuxy' to 'UNIX-like'
|
95,168 |
29.11.2018 16:32:23
| -3,600 |
390e93c45f5cdb6f030a5dc05e21aa821da6aa9d
|
Update embed.html.twig and remove video.html.twig
|
[
{
"change_type": "DELETE",
"old_path": "templates/_partials/fields/video.html.twig",
"new_path": null,
"diff": "-{% extends '@bolt/_partials/fields/_base.html.twig' %}\n-\n-{% block field %}\n- <input name=\"{{ name }}\" placeholder=\"First Name\" type=\"text\" value=\"{{ value }}\" class=\"form-control {{ class }}\" {{ attributes|default()|raw }}>\n-\n- <p>(Video preview, and some meta fields go here)</p>\n-\n- <mark>Note: This field is _practically_ the same as the <code>video</code>-field, only a bit more specific. Do we even need this one?</mark>\n-\n-{% endblock %}\n-\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Update embed.html.twig and remove video.html.twig
|
95,180 |
29.11.2018 19:15:45
| -3,600 |
9bf8c98d0516a308a253983885c2ab2d3fd50238
|
fixed number breaking issue
|
[
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/Editor/Number/Number.vue",
"new_path": "assets/js/app/editor/Components/Editor/Number/Number.vue",
"diff": ":step=\"step\"\nv-model=\"val\"\n>\n- <!-- <div class=\"input-group-append\">\n- <button\n- class=\"btn btn-sm btn-secondary\"\n- type=\"button\"\n- @click=\"calc(val, '-')\"\n- ><i class=\"fas fa-minus\"></i></button>\n- <button\n- class=\"btn btn-sm btn-secondary\"\n- type=\"button\"\n- @click=\"calc(val, '+')\"\n- ><i class=\"fas fa-plus\"></i></button>\n- </div> -->\n</div>\n</template>\n@@ -30,18 +18,5 @@ export default {\nname: \"editor-number\",\nprops: ['value', 'label', 'name', 'step', 'type', 'disabled'],\nmixins: [val],\n-\n- methods: {\n- calc(input, type){\n- let value = input\n-\n- if(input === '')\n- value = 0;\n- if(type === '+')\n- this.val = value += this.step\n- if(type === '-')\n- this.val = value -= this.step\n- }\n- }\n};\n</script>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "package-lock.json",
"new_path": "package-lock.json",
"diff": "},\n\"clean-webpack-plugin\": {\n\"version\": \"0.1.19\",\n- \"resolved\": \"http://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-0.1.19.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-0.1.19.tgz\",\n\"integrity\": \"sha512-M1Li5yLHECcN2MahoreuODul5LkjohJGFxLPTjl3j1ttKrF5rgjZET1SJduuqxLAuT1gAPOdkhg03qcaaU1KeA==\",\n\"dev\": true,\n\"requires\": {\n},\n\"colors\": {\n\"version\": \"1.1.2\",\n- \"resolved\": \"http://registry.npmjs.org/colors/-/colors-1.1.2.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/colors/-/colors-1.1.2.tgz\",\n\"integrity\": \"sha1-FopHAXVran9RoSzgyXv6KMCE7WM=\",\n\"dev\": true\n},\n},\n\"globby\": {\n\"version\": \"6.1.0\",\n- \"resolved\": \"http://registry.npmjs.org/globby/-/globby-6.1.0.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/globby/-/globby-6.1.0.tgz\",\n\"integrity\": \"sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=\",\n\"dev\": true,\n\"requires\": {\n},\n\"handle-thing\": {\n\"version\": \"1.2.5\",\n- \"resolved\": \"http://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz\",\n\"integrity\": \"sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ=\",\n\"dev\": true\n},\n},\n\"safe-regex\": {\n\"version\": \"1.1.0\",\n- \"resolved\": \"https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz\",\n+ \"resolved\": \"http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz\",\n\"integrity\": \"sha1-QKNmnzsHfR6UPURinhV91IAjvy4=\",\n\"dev\": true,\n\"requires\": {\n},\n\"strip-eof\": {\n\"version\": \"1.0.0\",\n- \"resolved\": \"https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz\",\n+ \"resolved\": \"http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz\",\n\"integrity\": \"sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=\",\n\"dev\": true\n},\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/number.html.twig",
"new_path": "templates/_partials/fields/number.html.twig",
"diff": "{% set step = 1 %}\n{% endif %}\n+\n<editor-number\nname=\"{{ name }}\"\n- :value=\"{{ value }}\"\n+ value=\"{{ value }}\"\n:step=\"{{ step }}\"\n></editor-number>\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
fixed number breaking issue
|
95,112 |
02.12.2018 00:01:43
| -3,600 |
f890a897b24e8cc8c0c781be699152325dbd350f
|
add docker env
|
[
{
"change_type": "MODIFY",
"old_path": "Makefile",
"new_path": "Makefile",
"diff": "@@ -38,3 +38,41 @@ db-reset:\nbin/console doctrine:schema:drop --force\nbin/console doctrine:schema:create\nbin/console doctrine:fixtures:load -n\n+\n+# Dockerized commands\n+docker-install:\n+ docker-compose exec -T php sh -c \"composer install\"\n+ docker-compose run node sh -c \"npm install\"\n+ docker-compose run node sh -c \"npm run build\"\n+\n+docker-start:\n+ make docker-install\n+ make docker-db-create\n+\n+docker-csclear:\n+ docker-compose exec -T php sh -c \"mkdir -p var/cache/ecs\"\n+ docker-compose exec -T php sh -c \"chmod -R a+rw var/cache/ecs\"\n+ docker-compose exec -T php sh -c \"rm -rf var/cache/ecs/*\"\n+\n+docker-cscheck:\n+ make docker-csclear\n+ docker-compose exec -T php sh -c \"vendor/bin/ecs check src\"\n+ make docker-stancheck\n+\n+docker-csfix:\n+ make docker-csclear\n+ docker-compose exec -T php sh -c \"vendor/bin/ecs check src --fix\"\n+ make docker-stancheck\n+\n+docker-stancheck:\n+ docker-compose exec -T php sh -c \"vendor/bin/phpstan analyse -c phpstan.neon src\"\n+\n+docker-db-create:\n+ docker-compose exec -T php sh -c \"bin/console doctrine:database:create\"\n+ docker-compose exec -T php sh -c \"bin/console doctrine:schema:create\"\n+ docker-compose exec -T php sh -c \"bin/console doctrine:fixtures:load -n\"\n+\n+docker-db-reset:\n+ docker-compose exec -T php sh -c \"bin/console doctrine:schema:drop --force\"\n+ docker-compose exec -T php sh -c \"bin/console doctrine:schema:create\"\n+ docker-compose exec -T php sh -c \"bin/console doctrine:fixtures:load -n\"\n"
},
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -34,6 +34,24 @@ Alternatively, run `make install`, on a UNIX-like system.\nIt's on the roadmap for Beta 1 to provide a `composer create-project` install.\n+Use with Docker\n+---------------\n+\n+To install Bolt 4 with Docker (for now, on a UNIX-like system):\n+\n+ - Check out the git repo\n+ - Then:\n+\n+ ```bash\n+docker-compose up -d\n+make docker-install\n+make docker-db-create\n+ ```\n+\n+Actually, just add `docker-` prefix to any Make command and that's it!\n+\n+In your browser, go to http://0.0.0.0:8088/ for the frontend, and to http://0.0.0.0:8088/bolt for the Admin Panel.\n+\nSet up Database\n---------------\n@@ -94,7 +112,7 @@ Run the following commands with `make`, to perform Code Style checking and\nautomatic fixing:\n- `make cscheck`: Run ECS and PHPStan\n- - `make cscheck`: Run ECS, perform automatic fixes and run PHPStan\n+ - `make csfix`: Run ECS, perform automatic fixes and run PHPStan\nOn windows, you can run the commands separately:\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docker-compose.yml",
"diff": "+version: '3.4'\n+services:\n+ php:\n+ build:\n+ context: ./docker/php\n+ dockerfile: Dockerfile\n+ cache_from:\n+ - php:7.3-rc-fpm\n+# env_file:\n+# - .env\n+# depends_on:\n+# - database\n+# - redis\n+ volumes:\n+ - ./:/var/www/bolt\n+ working_dir: /var/www/bolt\n+\n+# database:\n+# image: mariadb:10\n+# env_file:\n+# - .env\n+# ports:\n+# - 33306:3306\n+# environment:\n+# MYSQL_ROOT_PASSWORD: ${DB_PASSWORD}\n+# MYSQL_PASSWORD: ${DB_PASSWORD}\n+# MYSQL_USER: ${DB_USER}\n+# MYSQL_DATABASE: ${DB_NAME}\n+# MYSQL_INITDB_SKIP_TZINFO: 0\n+\n+# redis:\n+# image: redis:4-alpine\n+# env_file:\n+# - .env\n+# ports:\n+# - 6379\n+\n+ web:\n+ image: nginx:alpine\n+ ports:\n+ - 8088:80\n+ depends_on:\n+ - php\n+# env_file:\n+# - .env\n+ volumes:\n+ - ./docker/nginx:/etc/nginx/conf.d\n+ - ./:/var/www/bolt\n+ - ./var/logs:/var/log/nginx\n+ entrypoint:\n+ - sh\n+ - /etc/nginx/conf.d/entrypoint.sh\n+\n+ node:\n+ image: node:latest\n+ working_dir: /home/node/app\n+ volumes:\n+ - ./:/home/node/app\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docker/nginx/default.conf",
"diff": "+# Bolt virtual server\n+server {\n+ listen 80 default_server;\n+ root /var/www/bolt/public;\n+\n+ client_max_body_size 10M;\n+\n+ index index.php;\n+\n+ location / {\n+ # try to serve file directly, fallback to index.php\n+ try_files $uri /index.php$is_args$args;\n+ }\n+\n+ location ~ ^/index\\.php(/|$) {\n+ # Mitigate https://httpoxy.org/ vulnerabilities\n+ fastcgi_param HTTP_PROXY \"\";\n+\n+ # Set the HTTP parameter if not set in fastcgi_params\n+ fastcgi_param HTTPS $https if_not_empty;\n+\n+ fastcgi_pass php:9000;\n+ fastcgi_split_path_info ^(.+\\.php)(/.*)$;\n+ include fastcgi_params;\n+\n+ # optionally set the value of the environment variables used in the application\n+ # fastcgi_param APP_ENV prod;\n+ # fastcgi_param APP_SECRET <app-secret-id>;\n+ # fastcgi_param DATABASE_URL \"mysql://db_user:db_pass@host:3306/db_name\";\n+\n+ # When you are using symlinks to link the document root to the\n+ # current version of your application, you should pass the real\n+ # application path instead of the path to the symlink to PHP\n+ # FPM.\n+ # Otherwise, PHP's OPcache may not properly detect changes to\n+ # your PHP files (see https://github.com/zendtech/ZendOptimizerPlus/issues/126\n+ # for more information).\n+ fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;\n+ fastcgi_param DOCUMENT_ROOT $realpath_root;\n+ # Prevents URIs that include the front controller. This will 404:\n+ # http://domain.tld/index.php/some-path\n+ # Remove the internal directive to allow URIs like this\n+ internal;\n+ }\n+\n+ # return 404 for all other php files not matching the front controller\n+ # this prevents access to other php files you don't want to be accessible.\n+ location ~ \\.php$ {\n+ return 404;\n+ }\n+\n+ error_log /var/log/nginx/project_error.log;\n+ access_log /var/log/nginx/project_access.log;\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docker/nginx/default.conf.template",
"diff": "+# Bolt virtual server\n+server {\n+ listen 80 default_server;\n+ root /var/www/bolt/public;\n+\n+ client_max_body_size 10M;\n+\n+ index index.php;\n+\n+ location / {\n+ # try to serve file directly, fallback to index.php\n+ try_files $uri /index.php$is_args$args;\n+ }\n+\n+ location ~ ^/index\\.php(/|$) {\n+ # Mitigate https://httpoxy.org/ vulnerabilities\n+ fastcgi_param HTTP_PROXY \"\";\n+\n+ # Set the HTTP parameter if not set in fastcgi_params\n+ fastcgi_param HTTPS $https if_not_empty;\n+\n+ fastcgi_pass php:9000;\n+ fastcgi_split_path_info ^(.+\\.php)(/.*)$;\n+ include fastcgi_params;\n+\n+ # optionally set the value of the environment variables used in the application\n+ # fastcgi_param APP_ENV prod;\n+ # fastcgi_param APP_SECRET <app-secret-id>;\n+ # fastcgi_param DATABASE_URL \"mysql://db_user:db_pass@host:3306/db_name\";\n+\n+ # When you are using symlinks to link the document root to the\n+ # current version of your application, you should pass the real\n+ # application path instead of the path to the symlink to PHP\n+ # FPM.\n+ # Otherwise, PHP's OPcache may not properly detect changes to\n+ # your PHP files (see https://github.com/zendtech/ZendOptimizerPlus/issues/126\n+ # for more information).\n+ fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;\n+ fastcgi_param DOCUMENT_ROOT $realpath_root;\n+ # Prevents URIs that include the front controller. This will 404:\n+ # http://domain.tld/index.php/some-path\n+ # Remove the internal directive to allow URIs like this\n+ internal;\n+ }\n+\n+ # return 404 for all other php files not matching the front controller\n+ # this prevents access to other php files you don't want to be accessible.\n+ location ~ \\.php$ {\n+ return 404;\n+ }\n+\n+ error_log /var/log/nginx/project_error.log;\n+ access_log /var/log/nginx/project_access.log;\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docker/nginx/entrypoint.sh",
"diff": "+#!/usr/bin/env sh\n+\n+substitute_environment_variables()\n+{\n+ envsubst $(printenv | cut -f1 -d'=' | sed 's/.*/\\\\\\${&}/' | tr '\\n' ',')\n+}\n+\n+set -e\n+substitute_environment_variables < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf\n+nginx -g 'daemon off;'\n+\n+exit 0\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docker/php/confd/conf.d/php_ini.toml",
"diff": "+[template]\n+src = \"php_init.tmpl\"\n+dest = \"/usr/local/etc/php/php.ini\"\n+prefix = \"php\"\n+keys = [\n+ \"timezone\",\n+ \"memorylimit\",\n+ \"maxfilesize\",\n+ \"maxexectime\"\n+]\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docker/php/confd/templates/php_init.tmpl",
"diff": "+memory_limit={{ getv \"/memorylimit\" }}\n+timezone={{ getv \"/timezone\" }}\n+upload_max_filesize={{ getv \"/maxfilesize\" }}\n+post_max_size={{ getv \"/maxfilesize\" }}\n+max_execution_time={{ getv \"/maxexectime\" }}\n+short_open_tag=0\n+error_reporting = E_ALL\n+display_errors = Off\n+log_errors = On\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docker/php/entrypoint.sh",
"diff": "+#!/bin/sh\n+\n+export CONFD_ARGS=\"${CONFD_ARGS:--onetime -backend env}\"\n+export DOCKER_BRIDGE_IP=$(ip ro | grep default | cut -d' ' -f 3)\n+if [ \"$1\" = 'php-fpm' ]; then\n+ /bin/confd ${CONFD_ARGS}\n+ php-fpm\n+else\n+ /bin/confd ${CONFD_ARGS}\n+ exec /usr/bin/env \"$@\"\n+fi\n\\ No newline at end of file\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
add docker env
|
95,132 |
30.10.2018 12:01:52
| -3,600 |
bf05d5aa7b75e653d6927846a25d1531b2556786
|
Start with `setcontent` integration
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Twig/Extension/SetcontentExtension.php",
"diff": "+<?php\n+\n+declare(strict_types=1);\n+\n+namespace Bolt\\Twig\\Extension;\n+\n+use Bolt\\Twig\\TokenParser\\SetcontentTokenParser;\n+use Twig\\Extension\\AbstractExtension;\n+\n+/**\n+ * Setcontent functionality Twig extension.\n+ *\n+ * @author Xiao-Hu Tai <xiao@twokings.nl>\n+ */\n+class SetcontentExtension extends AbstractExtension\n+{\n+ /**\n+ * {@inheritdoc}\n+ */\n+ public function getTokenParsers()\n+ {\n+ $parsers = [\n+ new SetcontentTokenParser(),\n+ ];\n+\n+ return $parsers;\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Twig/Node/SetcontentNode.php",
"diff": "+<?php\n+\n+namespace Bolt\\Twig\\Node;\n+\n+use Bolt\\Twig\\Runtime\\SetcontentRuntime;\n+use Twig\\Compiler;\n+use Twig\\Node\\Expression\\ArrayExpression;\n+use Twig\\Node\\Node;\n+\n+/**\n+ * Twig setcontent node.\n+ *\n+ * @author Bob den Otter <bob@twokings.nl>\n+ * @author Ross Riley <riley.ross@gmail.com>\n+ * @author Xiao-Hu Tai <xiao@twokings.nl>\n+ */\n+class SetcontentNode extends Node\n+{\n+ /**\n+ * Constructor.\n+ *\n+ * @param string $name\n+ * @param Node $contentType\n+ * @param ArrayExpression $arguments\n+ * @param array $whereArguments\n+ * @param int $lineNo\n+ * @param null $tag\n+ */\n+ public function __construct($name, Node $contentType, ArrayExpression $arguments, array $whereArguments, $lineNo, $tag = null)\n+ {\n+ parent::__construct(\n+ $whereArguments,\n+ ['name' => $name, 'contenttype' => $contentType, 'arguments' => $arguments],\n+ $lineNo,\n+ $tag\n+ );\n+ }\n+\n+ /**\n+ * {@inheritdoc}\n+ */\n+ public function compile(Compiler $compiler)\n+ {\n+ $arguments = $this->getAttribute('arguments');\n+\n+ $compiler\n+ ->addDebugInfo($this)\n+ ->write(\"\\$context['\")\n+ ->raw($this->getAttribute('name'))\n+ ->raw(\"'] = \")\n+ ->raw(\"\\$this->env->getRuntime('\" . SetcontentRuntime::class . \"')->getContent(\")\n+ ->subcompile($this->getAttribute('contenttype'))\n+ ->raw(', ')\n+ ->subcompile($arguments)\n+ ;\n+\n+ if ($this->hasNode('wherearguments')) {\n+ $compiler\n+ ->raw(', ')\n+ ->subcompile($this->getNode('wherearguments'))\n+ ;\n+ }\n+\n+ $compiler->raw(\" );\\n\");\n+ }\n+ }\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Twig/Runtime/SetcontentRuntime.php",
"diff": "+<?php\n+\n+declare(strict_types=1);\n+\n+namespace Bolt\\Twig\\Runtime;\n+\n+use Bolt\\Configuration\\Config;\n+use Bolt\\Repository\\ContentRepository;\n+\n+class SetcontentRuntime\n+{\n+ /** @var Config $config */\n+ private $config;\n+ /** @var ContentRepository $repo */\n+ private $repo;\n+\n+ /**\n+ * @param Config $config\n+ * @param ContentRepository $repo\n+ */\n+ public function __construct(Config $config, ContentRepository $repo)\n+ {\n+ $this->config = $config;\n+ $this->repo = $repo;\n+ }\n+\n+ /**\n+ * @return ContentRepository\n+ */\n+ public function getContentRepository()\n+ {\n+ return $this->repo;\n+ }\n+\n+ /**\n+ * @param string $textQuery\n+ * @param array $parameters\n+ */\n+ public function getContent($textQuery, array $parameters = [])\n+ {\n+ // fix BC break\n+ if (func_num_args() === 3) {\n+ $whereparameters = func_get_arg(2);\n+ if (is_array($whereparameters) && !empty($whereparameters)) {\n+ $parameters = array_merge($parameters, $whereparameters);\n+ }\n+ }\n+\n+ $qb = $this->repo->createQueryBuilder('content')\n+ ->addSelect('a')\n+ ->innerJoin('content.author', 'a')\n+ ->orderBy('content.modifiedAt', 'DESC')\n+ ;\n+\n+ $contentType = explode('/', $textQuery)[0];\n+\n+ if ($contentType) {\n+ $qb\n+ ->where('content.contentType = :ct')\n+ ->setParameter('ct', $contentType)\n+ ;\n+ }\n+\n+ return $qb\n+ ->getQuery()\n+ ->getResult()\n+ ;\n+ // return $this->createPaginator($qb->getQuery(), $page);\n+\n+ // return $this->recordsView->createView(\n+ // $this->getContentByScope('frontend', $textQuery, $parameters)\n+ // );\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Twig/TokenParser/SetcontentTokenParser.php",
"diff": "+<?php\n+\n+namespace Bolt\\Twig\\TokenParser;\n+\n+use Bolt\\Twig\\Node\\SetcontentNode;\n+use Twig\\Node\\Expression\\ArrayExpression;\n+use Twig\\Node\\Expression\\ConstantExpression;\n+use Twig\\Token;\n+use Twig\\TokenParser\\AbstractTokenParser;\n+\n+/**\n+ * Twig {{ setcontent }} token parser.\n+ *\n+ * @author Bob den Otter <bob@twokings.nl>\n+ * @author Xiao-Hu Tai <xiao@twokings.nl>\n+ */\n+class SetcontentTokenParser extends AbstractTokenParser\n+{\n+ /**\n+ * {@inheritdoc}\n+ */\n+ public function __construct()\n+ {\n+ }\n+\n+ /**\n+ * {@inheritdoc}\n+ */\n+ public function parse(Token $token)\n+ {\n+ $lineno = $token->getLine();\n+\n+ $arguments = new ArrayExpression([], $lineno);\n+ $whereArguments = [];\n+\n+ // name - the new variable with the results\n+ $name = $this->parser->getStream()->expect(Token::NAME_TYPE)->getValue();\n+ $this->parser->getStream()->expect(Token::OPERATOR_TYPE, '=');\n+\n+ // ContentType, or simple expression to content.\n+ $contentType = $this->parser->getExpressionParser()->parseExpression();\n+\n+ $counter = 0;\n+\n+ do {\n+ // where parameter\n+ if ($this->parser->getStream()->test(Token::NAME_TYPE, 'where')) {\n+ $this->parser->getStream()->next();\n+ $whereArguments = ['wherearguments' => $this->parser->getExpressionParser()->parseExpression()];\n+ }\n+\n+ // limit parameter\n+ if ($this->parser->getStream()->test(Token::NAME_TYPE, 'limit')) {\n+ $this->parser->getStream()->next();\n+ $limit = $this->parser->getExpressionParser()->parseExpression();\n+ $arguments->addElement($limit, new ConstantExpression('limit', $lineno));\n+ }\n+\n+ // order / orderby parameter\n+ if ($this->parser->getStream()->test(Token::NAME_TYPE, 'order') ||\n+ $this->parser->getStream()->test(Token::NAME_TYPE, 'orderby')) {\n+ $this->parser->getStream()->next();\n+ $order = $this->parser->getExpressionParser()->parseExpression();\n+ $arguments->addElement($order, new ConstantExpression('order', $lineno));\n+ }\n+\n+ // paging / allowpaging parameter\n+ if ($this->parser->getStream()->test(Token::NAME_TYPE, 'paging') ||\n+ $this->parser->getStream()->test(Token::NAME_TYPE, 'allowpaging')) {\n+ $this->parser->getStream()->next();\n+ $arguments->addElement(\n+ new ConstantExpression(true, $lineno),\n+ new ConstantExpression('paging', $lineno)\n+ );\n+ }\n+\n+ // printquery parameter\n+ if ($this->parser->getStream()->test(Token::NAME_TYPE, 'printquery')) {\n+ $this->parser->getStream()->next();\n+ $arguments->addElement(\n+ new ConstantExpression(true, $lineno),\n+ new ConstantExpression('printquery', $lineno)\n+ );\n+ }\n+\n+ // returnsingle parameter\n+ if ($this->parser->getStream()->test(Token::NAME_TYPE, 'returnsingle')) {\n+ $this->parser->getStream()->next();\n+ $arguments->addElement(\n+ new ConstantExpression(true, $lineno),\n+ new ConstantExpression('returnsingle', $lineno)\n+ );\n+ }\n+\n+ // nohydrate parameter\n+ if ($this->parser->getStream()->test(Token::NAME_TYPE, 'nohydrate')) {\n+ $this->parser->getStream()->next();\n+ $arguments->addElement(\n+ new ConstantExpression(false, $lineno),\n+ new ConstantExpression('hydrate', $lineno)\n+ );\n+ }\n+\n+ // Make sure we don't get stuck in a loop, if a token can't be parsed.\n+ ++$counter;\n+ } while (!$this->parser->getStream()->test(Token::BLOCK_END_TYPE) && ($counter < 10));\n+\n+ $this->parser->getStream()->expect(Token::BLOCK_END_TYPE);\n+\n+ return new SetcontentNode($name, $contentType, $arguments, $whereArguments, $lineno, $this->getTag());\n+ }\n+\n+ /**\n+ * {@inheritdoc}\n+ */\n+ public function getTag()\n+ {\n+ return 'setcontent';\n+ }\n+}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Start with `setcontent` integration
|
95,132 |
01.11.2018 09:32:32
| -3,600 |
e76b25994cdec6d12598fcef6f070f0de2ed04df
|
(WIP) Refactor DBAL to ORM
Very rough early variant with some assumptions
|
[
{
"change_type": "MODIFY",
"old_path": "config/bolt/contenttypes.yaml",
"new_path": "config/bolt/contenttypes.yaml",
"diff": "@@ -138,7 +138,7 @@ entries:\nlisting_template: listing.twig\nlisting_records: 10\ndefault_status: published\n- sort: -datepublish\n+ sort: -publishedAt\nrecordsperpage: 20\nicon_many: \"fa:file-alt\"\nicon_one: \"fa:file-alt\"\n"
},
{
"change_type": "MODIFY",
"old_path": "config/services.yaml",
"new_path": "config/services.yaml",
"diff": "@@ -41,6 +41,27 @@ services:\narguments: [\"@knp_menu.factory\"]\ntags:\n- { name: knp_menu.menu_builder, method: createSidebarMenu, alias: sidebar } # The alias is what is used to retrieve the menu\n-\n# config/services.yaml\nTwig\\Extension\\StringLoaderExtension:\n+\n+ # Needed for SetContent from bolt/bolt\n+ Bolt\\Storage\\Query\\Query:\n+ calls:\n+ -\n+ method: addScope\n+ arguments: [ 'frontend', '@Bolt\\Storage\\Query\\FrontendQueryScope' ]\n+ Bolt\\Storage\\Query\\ContentQueryParser:\n+ calls:\n+ -\n+ method: addService\n+ arguments: [ 'select', '@Bolt\\Storage\\Query\\SelectQuery' ]\n+ -\n+ method: addService\n+ arguments: [ 'search', '@Bolt\\Storage\\Query\\SearchQuery' ]\n+ -\n+ method: addService\n+ arguments: [ 'search_weighter', '@Bolt\\Storage\\Query\\SearchWeighter' ]\n+ -\n+ method: addService\n+ arguments: [ 'search_config', '@Bolt\\Storage\\Query\\SearchConfig' ]\n+ Doctrine\\ORM\\Query\\Expr:\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Repository/ContentRepository.php",
"new_path": "src/Repository/ContentRepository.php",
"diff": "@@ -26,7 +26,7 @@ class ContentRepository extends ServiceEntityRepository\nparent::__construct($registry, Content::class);\n}\n- private function getQueryBuilder(): QueryBuilder\n+ public function getQueryBuilder(): QueryBuilder\n{\nreturn $this->createQueryBuilder('content');\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/ContentQueryParser.php",
"new_path": "src/Storage/Query/ContentQueryParser.php",
"diff": "@@ -4,8 +4,9 @@ namespace Bolt\\Storage\\Query;\nuse Bolt\\Events\\QueryEvent;\nuse Bolt\\Events\\QueryEvents;\n+use Bolt\\Repository\\ContentRepository;\nuse Bolt\\Storage\\Entity\\Content;\n-use Bolt\\Storage\\EntityManager;\n+//use Bolt\\Storage\\EntityManager;\nuse Bolt\\Storage\\Query\\Directive\\GetQueryDirective;\nuse Bolt\\Storage\\Query\\Directive\\HydrateDirective;\nuse Bolt\\Storage\\Query\\Directive\\LimitDirective;\n@@ -27,11 +28,12 @@ use Bolt\\Storage\\Query\\Handler\\SelectQueryHandler;\n* object representation.\n*\n* @author Ross Riley <riley.ross@gmail.com>\n+ * @author Xiao-Hu Tai <xiao@twokings.nl>\n*/\nclass ContentQueryParser\n{\n- /** @var EntityManager */\n- protected $em;\n+ /** @var ContentRepository */\n+ protected $repo;\n/** @var string */\nprotected $query;\n/** @var array */\n@@ -58,12 +60,12 @@ class ContentQueryParser\n/**\n* Constructor.\n*\n- * @param EntityManager $em\n+ * @param ContentRepository $repo\n* @param QueryInterface $queryHandler\n*/\n- public function __construct(EntityManager $em, QueryInterface $queryHandler = null)\n+ public function __construct(ContentRepository $repo, QueryInterface $queryHandler = null)\n{\n- $this->em = $em;\n+ $this->repo = $repo;\nif ($queryHandler !== null) {\n$this->addService('select', $queryHandler);\n@@ -250,13 +252,13 @@ class ContentQueryParser\n}\n/**\n- * Gets the object EntityManager.\n+ * Gets the content repository.\n*\n- * @return EntityManager\n+ * @return ContentRepository\n*/\n- public function getEntityManager()\n+ public function getContentRepository()\n{\n- return $this->em;\n+ return $this->repo;\n}\n/**\n@@ -442,12 +444,14 @@ class ContentQueryParser\npublic function fetch()\n{\n$this->parse();\n- $parseEvent = new QueryEvent($this);\n- $this->getEntityManager()->getEventManager()->dispatch(QueryEvents::PARSE, $parseEvent);\n-\n+ // $parseEvent = new QueryEvent($this);\n+ // $this->getEntityManager()->getEventManager()->dispatch(QueryEvents::PARSE, $parseEvent);\n+if (! empty($this->getOperation))\n$result = call_user_func($this->handlers[$this->getOperation()], $this);\n- $executeEvent = new QueryEvent($this, $result);\n- $this->getEntityManager()->getEventManager()->dispatch(QueryEvents::EXECUTE, $executeEvent);\n+else\n+ $result = call_user_func($this->handlers['select'], $this);;\n+ // $executeEvent = new QueryEvent($this, $result);\n+ // $this->getEntityManager()->getEventManager()->dispatch(QueryEvents::EXECUTE, $executeEvent);\nreturn $result;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/Directive/OrderDirective.php",
"new_path": "src/Storage/Query/Directive/OrderDirective.php",
"diff": "@@ -7,7 +7,7 @@ use Bolt\\Storage\\Query\\QueryInterface;\n/**\n* Directive to alter query based on 'order' parameter.\n*\n- * eg: 'pages', ['order'=>'-datepublish']\n+ * eg: 'pages', ['order'=>'-publishedAt']\n*/\nclass OrderDirective\n{\n@@ -22,7 +22,7 @@ class OrderDirective\n}\n// remove default order\n- $query->getQueryBuilder()->resetQueryPart('orderBy');\n+ $query->getQueryBuilder()->resetDQLPart('orderBy');\n$separatedOrders = $this->getOrderBys($order);\nforeach ($separatedOrders as $order) {\n@@ -36,7 +36,7 @@ class OrderDirective\n} else {\n$direction = null;\n}\n- $query->getQueryBuilder()->addOrderBy($order, $direction);\n+ $query->getQueryBuilder()->addOrderBy('content.' . $order, $direction);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/Filter.php",
"new_path": "src/Storage/Query/Filter.php",
"diff": "namespace Bolt\\Storage\\Query;\n-use Doctrine\\DBAL\\Query\\Expression\\CompositeExpression;\n+use Doctrine\\ORM\\Query\\Expr\\Composite;\n/**\n* This class represents a single filter that converts to an expression along\n@@ -14,7 +14,7 @@ use Doctrine\\DBAL\\Query\\Expression\\CompositeExpression;\nclass Filter\n{\nprotected $key;\n- /** @var CompositeExpression */\n+ /** @var Composite */\nprotected $expression;\n/** @var array */\nprotected $parameters = [];\n@@ -53,9 +53,9 @@ class Filter\n/**\n* Allows replacing the expression object with a modified one.\n*\n- * @param CompositeExpression $expression\n+ * @param Composite $expression\n*/\n- public function setExpression(CompositeExpression $expression)\n+ public function setExpression(Composite $expression)\n{\n$this->expression = $expression;\n}\n@@ -65,7 +65,7 @@ class Filter\n* only needed for on the fly modification, to get the compiled\n* expression use getExpression().\n*\n- * @return CompositeExpression\n+ * @return Composite\n*/\npublic function getExpressionObject()\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/FrontendQueryScope.php",
"new_path": "src/Storage/Query/FrontendQueryScope.php",
"diff": "namespace Bolt\\Storage\\Query;\n-use Bolt\\Config;\n+use Bolt\\Configuration\\Config;\nuse Bolt\\Storage\\Query\\Directive\\OrderDirective;\n/**\n@@ -52,7 +52,7 @@ class FrontendQueryScope implements QueryScopeInterface\n{\n$contentTypes = $this->config->get('contenttypes');\nforeach ($contentTypes as $type => $values) {\n- $sort = $values['sort'] ?: '-datepublish';\n+ $sort = $values['sort'] ?: '-publishedAt';\n$this->orderBys[$type] = $sort;\nif (isset($values['singular_slug'])) {\n$this->orderBys[$values['singular_slug']] = $sort;\n@@ -68,7 +68,7 @@ class FrontendQueryScope implements QueryScopeInterface\n$ct = $query->getContentType();\n// Setup default ordering of queries on a per-contenttype basis\n- if (empty($query->getQueryBuilder()->getQueryPart('orderBy')) && isset($this->orderBys[$ct])) {\n+ if (empty($query->getQueryBuilder()->getParameter('orderBy')) && isset($this->orderBys[$ct])) {\n$handler = new OrderDirective();\n$handler($query, $this->orderBys[$ct]);\n}\n@@ -76,7 +76,7 @@ class FrontendQueryScope implements QueryScopeInterface\n// Setup status to only published unless otherwise specified\n$status = $query->getParameter('status');\nif (!$status) {\n- $query->setParameter('status', 'published');\n+ $query->setParameter('status', 'published'); // no work??\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/Handler/SelectQueryHandler.php",
"new_path": "src/Storage/Query/Handler/SelectQueryHandler.php",
"diff": "@@ -27,9 +27,19 @@ class SelectQueryHandler\nforeach ($contentQuery->getContentTypes() as $contentType) {\n$contentType = str_replace('-', '_', $contentType);\n- $repo = $contentQuery->getEntityManager()->getRepository($contentType);\n- $query->setQueryBuilder($repo->createQueryBuilder('_' . $contentType));\n- $query->setContentType($contentType);\n+\n+ $repo = $contentQuery->getContentRepository();\n+ $query->setQueryBuilder($repo\n+ ->getQueryBuilder()\n+ // ->where('content.contentType = :ct')\n+ // ->setParameter('ct', $contentType)\n+ );\n+ // $query->setContentType($contentType);\n+ $query->setContentType('content');\n+\n+ // $repo = $contentQuery->getEntityManager()->getRepository($contentType);\n+ // $query->setQueryBuilder($repo->createQueryBuilder('_' . $contentType));\n+ // $query->setContentType($contentType);\n/** Run the parameters through the whitelister. If we get a false back from this method it's because there\n* is no need to continue with the query.\n@@ -38,13 +48,22 @@ class SelectQueryHandler\nif (!$params && count($contentQuery->getParameters())) {\ncontinue;\n}\n-\n+//$params['contentType'] = $contentType;\n/** Continue and run the query add the results to the set */\n$query->setParameters($params);\n$contentQuery->runScopes($query);\n$contentQuery->runDirectives($query);\n+// dd($query->build());\n+ // $query is of Bolt\\Storage\\Query\\SelectQuery\n+ // dd($query->getQueryBuilder()->getQuery());\n+\n+ $test = $query->build()\n+ ->andWhere('content.contentType = :ct')\n+ ->setParameter('ct', $contentType)\n+ ->getQuery()\n+ ;\n+ $result = $test->getResult();\n- $result = $repo->queryWith($query);\nif ($result) {\n$set->setOriginalQuery($contentType, $query->getQueryBuilder());\n$set->add($result, $contentType);\n@@ -73,10 +92,27 @@ class SelectQueryHandler\n*\n* @return bool|array $cleanParams\n*/\n- public function whitelistParameters(array $queryParams, Repository $repo)\n+ public function whitelistParameters(array $queryParams, $repo)\n{\n- $metadata = $repo->getClassMetadata();\n- $allowedParams = array_keys($metadata->getFieldMappings());\n+ // $metadata = $repo->getClassMetadata();\n+ // $allowedParams = array_keys($metadata->getFieldMappings());\n+ $allowedParams = [\n+ 0 => \"id\",\n+ 1 => \"slug\",\n+ 2 => \"datecreated\",\n+ 3 => \"datechanged\",\n+ 4 => \"datepublish\",\n+ 5 => \"datedepublish\",\n+ 6 => \"ownerid\",\n+ 7 => \"status\",\n+ 8 => \"templatefields\",\n+ 9 => \"title\",\n+ 10 => \"image\",\n+ 11 => \"teaser\",\n+ 12 => \"content\",\n+ 13 => \"contentlink\",\n+ 14 => \"incomingrelation\",\n+ ];\n$cleanParams = [];\nforeach ($queryParams as $fieldSelect => $valueSelect) {\n$stack = [];\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/Query.php",
"new_path": "src/Storage/Query/Query.php",
"diff": "@@ -24,6 +24,7 @@ class Query\n{\n$this->parser = $parser;\n$this->recordsView = $recordsView;\n+ $this->scopes = [];\n}\n/**\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/QueryParameterParser.php",
"new_path": "src/Storage/Query/QueryParameterParser.php",
"diff": "namespace Bolt\\Storage\\Query;\n-use Bolt\\Exception\\QueryParseException;\n-use Doctrine\\DBAL\\Query\\Expression\\ExpressionBuilder;\n+use Doctrine\\ORM\\Query\\Expr;\n/**\n* Handler class to convert the DSL for content query parameters\n@@ -32,7 +31,7 @@ class QueryParameterParser\n*\n* @param ExpressionBuilder $expr\n*/\n- public function __construct(ExpressionBuilder $expr = null)\n+ public function __construct(Expr $expr)\n{\n$this->expr = $expr;\n$this->setupDefaults();\n@@ -77,15 +76,12 @@ class QueryParameterParser\n* @param string $key\n* @param mixed $value\n*\n- * @throws QueryParseException\n- * @throws QueryParseException\n- *\n* @return Filter|null\n*/\npublic function getFilter($key, $value = null)\n{\n- if (!$this->expr instanceof ExpressionBuilder) {\n- throw new QueryParseException('Cannot call method without an Expression Builder parameter set', 1);\n+ if (!$this->expr instanceof Expr) {\n+ throw new \\Exception('Cannot call method without an Expression Builder parameter set', 1);\n}\n/** @var callable $callback */\n@@ -106,8 +102,6 @@ class QueryParameterParser\n* @param string $value\n* @param ExpressionBuilder $expr\n*\n- * @throws QueryParseException\n- *\n* @return null\n*/\npublic function incorrectQueryHandler($key, $value, $expr)\n@@ -116,7 +110,7 @@ class QueryParameterParser\nreturn null;\n}\nif (strpos($value, '&&') && strpos($value, '||')) {\n- throw new QueryParseException('Mixed && and || operators are not supported', 1);\n+ throw new \\Exception('Mixed && and || operators are not supported', 1);\n}\n}\n@@ -129,8 +123,6 @@ class QueryParameterParser\n* @param string $value\n* @param ExpressionBuilder $expr\n*\n- * @throws QueryParseException\n- *\n* @return Filter|null\n*/\npublic function multipleKeyAndValueHandler($key, $value, $expr)\n@@ -185,8 +177,6 @@ class QueryParameterParser\n* @param string $value\n* @param ExpressionBuilder $expr\n*\n- * @throws QueryParseException\n- *\n* @return Filter|null\n*/\npublic function multipleValueHandler($key, $value, $expr)\n@@ -237,8 +227,6 @@ class QueryParameterParser\n* @param string|array $value\n* @param ExpressionBuilder $expr\n*\n- * @throws QueryParseException\n- *\n* @return Filter\n*/\npublic function defaultFilterHandler($key, $value, $expr)\n@@ -287,8 +275,6 @@ class QueryParameterParser\n*\n* @param string $value Value to process\n*\n- * @throws QueryParseException\n- *\n* @return array Parsed values\n*/\npublic function parseValue($value)\n@@ -309,7 +295,7 @@ class QueryParameterParser\n}\n}\n- throw new QueryParseException(sprintf('No matching value found for \"%s\"', $value));\n+ throw new \\Exception(sprintf('No matching value found for \"%s\"', $value));\n}\n/**\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/SearchConfig.php",
"new_path": "src/Storage/Query/SearchConfig.php",
"diff": "namespace Bolt\\Storage\\Query;\n-use Bolt\\Config;\n+use Bolt\\Configuration\\Config;\n/**\n* This class takes an overall config array as input and parses into values\n@@ -17,10 +17,8 @@ class SearchConfig\nprotected $config = [];\n/** @var array */\nprotected $searchableTypes = [];\n-\n/** @var array */\nprotected $invisibleTypes = [];\n-\n/** @var array */\nprotected $joins = [];\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/SearchQuery.php",
"new_path": "src/Storage/Query/SearchQuery.php",
"diff": "@@ -32,7 +32,7 @@ class SearchQuery extends SelectQuery\n* @param QueryParameterParser $parser\n* @param SearchConfig $config\n*/\n- public function __construct(QueryBuilder $qb, QueryParameterParser $parser, SearchConfig $config)\n+ public function __construct(QueryBuilder $qb = null, QueryParameterParser $parser, SearchConfig $config)\n{\nparent::__construct($qb, $parser);\n$this->config = $config;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/SelectQuery.php",
"new_path": "src/Storage/Query/SelectQuery.php",
"diff": "namespace Bolt\\Storage\\Query;\n-use Doctrine\\DBAL\\Connection;\n-use Doctrine\\DBAL\\Query\\Expression\\CompositeExpression;\n-use Doctrine\\DBAL\\Query\\QueryBuilder;\n+use Doctrine\\ORM\\Connection;\n+use Doctrine\\ORM\\Query\\Expression\\CompositeExpression;\n+use Doctrine\\ORM\\Query\\QueryBuilder;\n/**\n* This query class coordinates a select query build from Bolt's\n@@ -29,6 +29,7 @@ class SelectQuery implements ContentQueryInterface\nprotected $params;\n/** @var Filter[] */\nprotected $filters = [];\n+ /** @var array */\nprotected $replacements = [];\n/** @var bool */\nprotected $singleFetchMode = false;\n@@ -39,7 +40,7 @@ class SelectQuery implements ContentQueryInterface\n* @param QueryBuilder $qb\n* @param QueryParameterParser $parser\n*/\n- public function __construct(QueryBuilder $qb, QueryParameterParser $parser)\n+ public function __construct(QueryBuilder $qb = null, QueryParameterParser $parser)\n{\n$this->qb = $qb;\n$this->parser = $parser;\n@@ -115,7 +116,6 @@ class SelectQuery implements ContentQueryInterface\nif (!count($this->filters)) {\nreturn null;\n}\n-\n$expr = $this->qb->expr()->andX();\nforeach ($this->filters as $filter) {\n$expr = $expr->add($filter->getExpression());\n@@ -223,7 +223,7 @@ class SelectQuery implements ContentQueryInterface\n*\n* @param QueryBuilder $qb\n*/\n- public function setQueryBuilder(QueryBuilder $qb)\n+ public function setQueryBuilder($qb)\n{\n$this->qb = $qb;\n}\n@@ -269,7 +269,9 @@ class SelectQuery implements ContentQueryInterface\n{\n$this->filters = [];\nforeach ($this->params as $key => $value) {\n- $this->parser->setAlias('_' . $this->contentType);\n+ // $this->parser // Bolt\\Storage\\Query\\QueryParameterParser\n+ // $this->parser->setAlias('_' . $this->contentType);\n+ $this->parser->setAlias('content');\n$filter = $this->parser->getFilter($key, $value);\nif ($filter) {\n$this->addFilter($filter);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/Node/SetcontentNode.php",
"new_path": "src/Twig/Node/SetcontentNode.php",
"diff": "@@ -48,7 +48,7 @@ class SetcontentNode extends Node\n->write(\"\\$context['\")\n->raw($this->getAttribute('name'))\n->raw(\"'] = \")\n- ->raw(\"\\$this->env->getRuntime('\" . SetcontentRuntime::class . \"')->getContent(\")\n+ ->raw(\"\\$this->env->getRuntime('\" . SetcontentRuntime::class . \"')->getQueryEngine()->getContentForTwig(\")\n->subcompile($this->getAttribute('contenttype'))\n->raw(', ')\n->subcompile($arguments)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/Runtime/SetcontentRuntime.php",
"new_path": "src/Twig/Runtime/SetcontentRuntime.php",
"diff": "@@ -4,71 +4,30 @@ declare(strict_types=1);\nnamespace Bolt\\Twig\\Runtime;\n-use Bolt\\Configuration\\Config;\n-use Bolt\\Repository\\ContentRepository;\n+use Bolt\\Storage\\Query\\Query;\nclass SetcontentRuntime\n{\n- /** @var Config $config */\n- private $config;\n- /** @var ContentRepository $repo */\n- private $repo;\n+ /** @var Query $queryEngine */\n+ private $queryEngine;\n+ /** @var MetadataDriver $metadataDriver */\n+ private $metadataDriver;\n/**\n- * @param Config $config\n- * @param ContentRepository $repo\n+ * @param Query $queryEngine\n+ * @param MetadataDriver $metadataDriver\n*/\n- public function __construct(Config $config, ContentRepository $repo)\n+ public function __construct(Query $queryEngine, MetadataDriver $metadataDriver = null)\n{\n- $this->config = $config;\n- $this->repo = $repo;\n+ $this->queryEngine = $queryEngine;\n+ $this->metadataDriver = $metadataDriver; // still needed?\n}\n/**\n- * @return ContentRepository\n+ * @return Query\n*/\n- public function getContentRepository()\n+ public function getQueryEngine()\n{\n- return $this->repo;\n- }\n-\n- /**\n- * @param string $textQuery\n- * @param array $parameters\n- */\n- public function getContent($textQuery, array $parameters = [])\n- {\n- // fix BC break\n- if (func_num_args() === 3) {\n- $whereparameters = func_get_arg(2);\n- if (is_array($whereparameters) && !empty($whereparameters)) {\n- $parameters = array_merge($parameters, $whereparameters);\n- }\n- }\n-\n- $qb = $this->repo->createQueryBuilder('content')\n- ->addSelect('a')\n- ->innerJoin('content.author', 'a')\n- ->orderBy('content.modifiedAt', 'DESC')\n- ;\n-\n- $contentType = explode('/', $textQuery)[0];\n-\n- if ($contentType) {\n- $qb\n- ->where('content.contentType = :ct')\n- ->setParameter('ct', $contentType)\n- ;\n- }\n-\n- return $qb\n- ->getQuery()\n- ->getResult()\n- ;\n- // return $this->createPaginator($qb->getQuery(), $page);\n-\n- // return $this->recordsView->createView(\n- // $this->getContentByScope('frontend', $textQuery, $parameters)\n- // );\n+ return $this->queryEngine;\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/TwigRecordsView.php",
"new_path": "src/Twig/TwigRecordsView.php",
"diff": "namespace Bolt\\Twig;\n-use Bolt\\Storage\\Entity\\Content;\n-use Bolt\\Storage\\Field\\Collection\\FieldCollection;\n+// use Bolt\\Storage\\Entity\\Content;\n+// use Bolt\\Storage\\Field\\Collection\\FieldCollection;\nuse Bolt\\Storage\\Mapping\\MetadataDriver;\nuse Bolt\\Storage\\Query\\QueryResultset;\n-use ParsedownExtra;\n+// use ParsedownExtra;\nuse Twig\\Markup;\n/**\n@@ -14,6 +14,7 @@ use Twig\\Markup;\n* so appropriate transformation can occur.\n*\n* @author Ross Riley <riley.ross@gmail.com>\n+ * @author Xiao-Hu Tai <xiao@twokings.nl>\n*/\nclass TwigRecordsView\n{\n@@ -27,7 +28,7 @@ class TwigRecordsView\n*\n* @param MetadataDriver $metadata\n*/\n- public function __construct(MetadataDriver $metadata)\n+ public function __construct(MetadataDriver $metadata = null)\n{\n$this->metadata = $metadata;\n$this->setupDefaults();\n@@ -55,20 +56,20 @@ class TwigRecordsView\nreturn new Markup($value, 'UTF-8');\n});\n- $this->addTransformer('repeater', function ($value) {\n- /** @var FieldCollection $collection */\n- foreach ($value as $collection) {\n- foreach ($collection as $field) {\n- $field->setValue($this->transform($field->getValue(), $field->getFieldType()));\n- }\n- }\n+ // $this->addTransformer('repeater', function ($value) {\n+ // /** @var FieldCollection $collection */\n+ // foreach ($value as $collection) {\n+ // foreach ($collection as $field) {\n+ // $field->setValue($this->transform($field->getValue(), $field->getFieldType()));\n+ // }\n+ // }\n- return $value;\n- });\n+ // return $value;\n+ // });\n- $this->addTransformer('block', function ($value) {\n- return $this->transform($value, 'repeater');\n- });\n+ // $this->addTransformer('block', function ($value) {\n+ // return $this->transform($value, 'repeater');\n+ // });\n}\n/**\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
(WIP) Refactor DBAL to ORM
Very rough early variant with some assumptions
|
95,132 |
15.11.2018 15:35:53
| -3,600 |
b9df695b90a5b49cfd269b2e1336ad403f858870
|
Cast `preg_match` parameter to string (warning when integer)
|
[
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/QueryParameterParser.php",
"new_path": "src/Storage/Query/QueryParameterParser.php",
"diff": "@@ -16,7 +16,6 @@ class QueryParameterParser\n{\n/** @var string */\npublic $alias;\n-\n/** @var string */\nprotected $key;\n/** @var mixed */\n@@ -282,7 +281,7 @@ class QueryParameterParser\nforeach ($this->valueMatchers as $matcher) {\n$regex = sprintf('/%s/u', $matcher['token']);\n$values = $matcher['params'];\n- if (preg_match($regex, $value)) {\n+ if (preg_match($regex, (string)$value)) {\nif (is_callable($values['value'])) {\npreg_match($regex, $value, $output);\n$values['value'] = $values['value']($output[1]);\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Cast `preg_match` parameter to string (warning when integer)
|
95,132 |
15.11.2018 16:25:33
| -3,600 |
1c7bc21f585a7228f151d7ca9bacc56f948fe90f
|
No need to check for `getOperation()` anymore
and if it was needed a set of `()` was missing in the IF-statement
|
[
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/ContentQueryParser.php",
"new_path": "src/Storage/Query/ContentQueryParser.php",
"diff": "@@ -448,11 +448,7 @@ class ContentQueryParser\n$this->parse();\n// $parseEvent = new QueryEvent($this);\n// $this->getEntityManager()->getEventManager()->dispatch(QueryEvents::PARSE, $parseEvent);\n- if (!empty($this->getOperation)) {\n$result = call_user_func($this->handlers[$this->getOperation()], $this);\n- } else {\n- $result = call_user_func($this->handlers['select'], $this);\n- }\n// $executeEvent = new QueryEvent($this, $result);\n// $this->getEntityManager()->getEventManager()->dispatch(QueryEvents::EXECUTE, $executeEvent);\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
No need to check for `getOperation()` anymore
and if it was needed a set of `()` was missing in the IF-statement
|
95,132 |
16.11.2018 09:40:36
| -3,600 |
d73090b83005991e483ba6bcbebba510c69ccb50
|
Modify Setcontent to match current repo (without Runtime)
|
[
{
"change_type": "DELETE",
"old_path": "src/Twig/Extension/SetcontentExtension.php",
"new_path": null,
"diff": "-<?php\n-\n-declare(strict_types=1);\n-\n-namespace Bolt\\Twig\\Extension;\n-\n-use Bolt\\Twig\\TokenParser\\SetcontentTokenParser;\n-use Twig\\Extension\\AbstractExtension;\n-\n-/**\n- * Setcontent functionality Twig extension.\n- *\n- * @author Xiao-Hu Tai <xiao@twokings.nl>\n- */\n-class SetcontentExtension extends AbstractExtension\n-{\n- /**\n- * {@inheritdoc}\n- */\n- public function getTokenParsers()\n- {\n- $parsers = [\n- new SetcontentTokenParser(),\n- ];\n-\n- return $parsers;\n- }\n-}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/Node/SetcontentNode.php",
"new_path": "src/Twig/Node/SetcontentNode.php",
"diff": "@@ -4,7 +4,7 @@ declare(strict_types=1);\nnamespace Bolt\\Twig\\Node;\n-use Bolt\\Twig\\Runtime\\SetcontentRuntime;\n+use Bolt\\Twig\\SetcontentExtension;\nuse Twig\\Compiler;\nuse Twig\\Node\\Expression\\ArrayExpression;\nuse Twig\\Node\\Node;\n@@ -50,7 +50,7 @@ class SetcontentNode extends Node\n->write(\"\\$context['\")\n->raw($this->getAttribute('name'))\n->raw(\"'] = \")\n- ->raw(\"\\$this->env->getRuntime('\" . SetcontentRuntime::class . \"')->getQueryEngine()->getContentForTwig(\")\n+ ->raw(\"\\$this->env->getExtension('\" . SetcontentExtension::class . \"')->getQueryEngine()->getContentForTwig(\")\n->subcompile($this->getAttribute('contenttype'))\n->raw(', ')\n->subcompile($arguments)\n"
},
{
"change_type": "RENAME",
"old_path": "src/Twig/Runtime/SetcontentRuntime.php",
"new_path": "src/Twig/SetcontentExtension.php",
"diff": "declare(strict_types=1);\n-namespace Bolt\\Twig\\Runtime;\n+namespace Bolt\\Twig;\nuse Bolt\\Storage\\Query\\Query;\n+use Bolt\\Twig\\TokenParser\\SetcontentTokenParser;\n+use Twig\\Extension\\AbstractExtension;\n-class SetcontentRuntime\n+/**\n+ * Setcontent functionality Twig extension.\n+ *\n+ * @author Xiao-Hu Tai <xiao@twokings.nl>\n+ */\n+class SetcontentExtension extends AbstractExtension\n{\n/** @var Query $queryEngine */\nprivate $queryEngine;\n@@ -23,6 +30,18 @@ class SetcontentRuntime\n$this->metadataDriver = $metadataDriver; // still needed?\n}\n+ /**\n+ * {@inheritdoc}\n+ */\n+ public function getTokenParsers()\n+ {\n+ $parsers = [\n+ new SetcontentTokenParser(),\n+ ];\n+\n+ return $parsers;\n+ }\n+\n/**\n* @return Query\n*/\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Modify Setcontent to match current repo (without Runtime)
|
95,132 |
16.11.2018 10:52:26
| -3,600 |
ced02a4f9fbefa9e87df2e6879971709cddd87f6
|
Return early if an empty search is attempted
See:
|
[
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/Handler/SearchQueryHandler.php",
"new_path": "src/Storage/Query/Handler/SearchQueryHandler.php",
"diff": "@@ -34,6 +34,11 @@ class SearchQueryHandler\n$query->setContentType($contentType);\n$searchParam = $contentQuery->getParameter('filter');\n+ /** If we have an empty search filter then we need to return early */\n+ if (empty($searchParam)) {\n+ return $set;\n+ }\n+\n$query->setParameters($contentQuery->getParameters());\n$query->setSearch($searchParam);\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Return early if an empty search is attempted
See: https://github.com/bolt/bolt/commit/bd823dee5919645b8c33ba4accc487e25735fa98#diff-62941ecfac9b632f60e6d0e5a8eac524
|
95,132 |
30.11.2018 14:02:55
| -3,600 |
77eb7d033f71c44c5f265035519d67eb2e9a3e90
|
Start with JOINs on `bolt_field` table
|
[
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/Handler/SelectQueryHandler.php",
"new_path": "src/Storage/Query/Handler/SelectQueryHandler.php",
"diff": "@@ -31,12 +31,8 @@ class SelectQueryHandler\n$contentType = str_replace('-', '_', $contentType);\n$repo = $contentQuery->getContentRepository();\n- $query->setQueryBuilder(\n- $repo\n- ->getQueryBuilder()\n- // ->where('content.contentType = :ct')\n- // ->setParameter('ct', $contentType)\n- );\n+ $qb = $repo->getQueryBuilder();\n+ $query->setQueryBuilder($qb);\n// $query->setContentType($contentType);\n$query->setContentType('content');\n@@ -47,11 +43,13 @@ class SelectQueryHandler\n/** Run the parameters through the whitelister. If we get a false back from this method it's because there\n* is no need to continue with the query.\n*/\n- $params = $this->whitelistParameters($contentQuery->getParameters(), $repo);\n- if (!$params && count($contentQuery->getParameters())) {\n- continue;\n- }\n+ // $params = $this->whitelistParameters($contentQuery->getParameters(), $repo);\n+ // if (!$params && count($contentQuery->getParameters())) {\n+ // continue;\n+ // }\n//$params['contentType'] = $contentType;\n+ $params = $this->cleanParameters($contentQuery->getParameters());\n+\n/* Continue and run the query add the results to the set */\n$query->setParameters($params);\n$contentQuery->runScopes($query);\n@@ -60,12 +58,12 @@ class SelectQueryHandler\n// $query is of Bolt\\Storage\\Query\\SelectQuery\n// dd($query->getQueryBuilder()->getQuery());\n- $test = $query->build()\n- ->andWhere('content.contentType = :ct')\n- ->setParameter('ct', $contentType)\n- ->getQuery()\n- ;\n- $result = $test->getResult();\n+ $foo = $query->build();\n+ $foo->andWhere('content.contentType = :ct');\n+ $foo->setParameter('ct', $contentType);\n+\n+ $this->setWhereParameters($foo, $qb, $repo, $contentQuery->getParameters()); // ROUGH!\n+ $result = $foo->getQuery()->getResult();\nif ($result) {\n$set->setOriginalQuery($contentType, $query->getQueryBuilder());\n@@ -84,6 +82,85 @@ class SelectQueryHandler\nreturn $set;\n}\n+ // ---------------------------------------------------------------------------------------------\n+\n+ var $coreFields = [\n+ 'id',\n+ 'created_at',\n+ 'modified_at',\n+ 'published_at',\n+ 'depublished_at',\n+ 'author_id',\n+ 'status',\n+ ];\n+\n+ /**\n+ *\n+ */\n+ private function cleanParameters($params)\n+ {\n+ $cleanParams = [];\n+\n+ foreach ($params as $key => $value) {\n+ if (in_array($key, $this->coreFields)) {\n+ $cleanParams[$key] = $value;\n+ }\n+ }\n+ return $cleanParams;\n+ }\n+\n+ /**\n+ *\n+ */\n+ private function setWhereParameters($q, $qb, $repo, $params)\n+ {\n+ // todo: Check if a key is a column in the `bolt_content` table or a row in the `bolt_fields` table.\n+ // todo: Is there a difference between taxonomies?\n+ // todo: Add a (default) locale check when it is ready.\n+\n+ // Let's allow every other field, because it will not throw an error anymore. It\n+ // will just not return no results. In previous Bolt versions, it would throw an\n+ // exception if the column did not exist. We can still double check this with\n+ // `contenttypes.yml`.\n+ $index = 0;\n+ foreach ($params as $key => $value) {\n+ if (in_array($key, $this->coreFields)) {\n+ //something going on with id and slug blegh!\n+ // $q = $q\n+ // ->andWhere('content.' . $key . ' = :key')\n+ // ->setParmeter($key, $value)\n+ // ;\n+ } else {\n+ $contentAlias = 'content_' . $index;\n+ $fieldsAlias = 'fields_' . $index;\n+ $keyParam = 'field_' . $index;\n+ $valueParam = 'value_' . $index;\n+\n+ $q = $q\n+ ->andWhere(\n+ $qb->expr()->in('content.id',\n+ $repo\n+ ->createQueryBuilder($contentAlias)\n+ ->select($contentAlias . '.id')\n+ ->innerJoin($contentAlias. '.fields', $fieldsAlias)\n+ ->andWhere($fieldsAlias . '.name = :' . $keyParam)\n+ ->andWhere($fieldsAlias . '.value = :' . $valueParam)\n+ ->getDQL()\n+ )\n+ )\n+ ->setParameter($keyParam, $key)\n+ ->setParameter($valueParam, \\GuzzleHttp\\json_encode([ $value ]))\n+ ;\n+\n+ $index++;\n+ }\n+ }\n+\n+ return $q;\n+ }\n+\n+\n+\n/**\n* This block is added to deal with the possibility that a requested filter is not an allowable option on the\n* database table. If the requested field filter is not a valid field on this table then we completely skip\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Start with JOINs on `bolt_field` table
|
95,132 |
27.11.2018 17:51:09
| -3,600 |
223788902f7265da063b8b2a3e6779384e410376
|
Remove `random` handler
|
[
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/ContentQueryParser.php",
"new_path": "src/Storage/Query/ContentQueryParser.php",
"diff": "@@ -21,7 +21,6 @@ use Bolt\\Storage\\Query\\Handler\\FirstQueryHandler;\nuse Bolt\\Storage\\Query\\Handler\\IdentifiedSelectHandler;\nuse Bolt\\Storage\\Query\\Handler\\LatestQueryHandler;\nuse Bolt\\Storage\\Query\\Handler\\NativeSearchHandler;\n-use Bolt\\Storage\\Query\\Handler\\RandomQueryHandler;\nuse Bolt\\Storage\\Query\\Handler\\SearchQueryHandler;\nuse Bolt\\Storage\\Query\\Handler\\SelectQueryHandler;\n@@ -47,7 +46,7 @@ class ContentQueryParser\n/** @var string */\nprotected $identifier;\n/** @var array */\n- protected $operations = ['search', 'latest', 'first', 'random', 'nativesearch'];\n+ protected $operations = ['search', 'latest', 'first', 'nativesearch'];\n/** @var array */\nprotected $directives = [];\n/** @var callable[] */\n@@ -83,7 +82,6 @@ class ContentQueryParser\n{\n$this->addHandler('select', new SelectQueryHandler());\n$this->addHandler('search', new SearchQueryHandler());\n- $this->addHandler('random', new RandomQueryHandler());\n$this->addHandler('first', new FirstQueryHandler());\n$this->addHandler('latest', new LatestQueryHandler());\n$this->addHandler('nativesearch', new NativeSearchHandler());\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/Directive/OrderDirective.php",
"new_path": "src/Storage/Query/Directive/OrderDirective.php",
"diff": "@@ -38,7 +38,26 @@ class OrderDirective\n} else {\n$direction = null;\n}\n+\n+ // - Check if its a column\n+ // - Check if its a row in `bolt_fields`\n+ $coreFields = [\n+ 'id',\n+ 'created_at',\n+ 'modified_at',\n+ 'published_at',\n+ 'depublished_at',\n+ 'author_id',\n+ 'status',\n+ ];\n+\n+ if (in_array($order, $coreFields)) {\n$query->getQueryBuilder()->addOrderBy('content.' . $order, $direction);\n+ } else {\n+ // need a merge, but will not be possible with multiple values?\n+ // $query->getQueryBuilder()->addOrderBy('fields_1'.$order, $direction);\n+ throw new \\Exception('not implemented yet ...');\n+ }\n}\n}\n"
},
{
"change_type": "DELETE",
"old_path": "src/Storage/Query/Handler/RandomQueryHandler.php",
"new_path": null,
"diff": "-<?php\n-\n-declare(strict_types=1);\n-\n-namespace Bolt\\Storage\\Query\\Handler;\n-\n-use Bolt\\Storage\\Query\\ContentQueryParser;\n-use Bolt\\Storage\\Query\\QueryResultset;\n-\n-/**\n- * Handler for queries requested with the random modifier.\n- *\n- * eg: 'pages/random/10'\n- */\n-class RandomQueryHandler\n-{\n- /**\n- * @param ContentQueryParser $contentQuery\n- *\n- * @return QueryResultset\n- */\n- public function __invoke(ContentQueryParser $contentQuery)\n- {\n- $params = $contentQuery->getEntityManager()->createQueryBuilder()->getConnection()->getParams();\n- if (mb_strpos($params['driver'], 'mysql') !== false) {\n- $contentQuery->setDirective('order', 'RAND()');\n- } else {\n- $contentQuery->setDirective('order', 'RANDOM()');\n- }\n-\n- return call_user_func($contentQuery->getHandler('select'), $contentQuery);\n- }\n-}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Remove `random` handler
|
95,132 |
29.11.2018 14:55:01
| -3,600 |
95e86f563fe4e9efcdd83959e7bf3ce92b9df2a9
|
Make queries work again and add small changes
|
[
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/Directive/OrderDirective.php",
"new_path": "src/Storage/Query/Directive/OrderDirective.php",
"diff": "@@ -46,7 +46,7 @@ class OrderDirective\n$direction = null;\n}\n- if (in_array($order, $this->coreFields)) {\n+ if (in_array($order, $this->coreFields, true)) {\n$query->getQueryBuilder()->addOrderBy('content.' . $order, $direction);\n} else {\n$fieldsAlias = 'fields_order_' . $index;\n@@ -57,8 +57,8 @@ class OrderDirective\n->andWhere($fieldsAlias . '.name = :' . $fieldAlias)\n->addOrderBy($fieldsAlias . '.value', $direction)\n->setParameter($fieldAlias, $order);\n- ;\n- $index++;\n+\n+ ++$index;\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/Handler/SelectQueryHandler.php",
"new_path": "src/Storage/Query/Handler/SelectQueryHandler.php",
"diff": "@@ -8,8 +8,6 @@ use Bolt\\Storage\\Entity\\Content;\nuse Bolt\\Storage\\Query\\ContentQueryParser;\nuse Bolt\\Storage\\Query\\QueryResultset;\nuse Bolt\\Storage\\Query\\SelectQuery;\n-use Bolt\\Storage\\Repository;\n-use Doctrine\\ORM\\QueryBuilder;\n/**\n* Handler class to perform select query and return a resultset.\n@@ -37,23 +35,29 @@ class SelectQueryHandler\n// $query->setContentType($contentType);\n$query->setContentType('content');\n- $params = $this->cleanParameters($contentQuery->getParameters());\n-\n- /* Continue and run the query add the results to the set */\n- $query->setParameters($params);\n+ $query->setParameters($contentQuery->getParameters());\n$contentQuery->runScopes($query);\n$contentQuery->runDirectives($query);\n+ // This is required. Not entirely sure why.\n+ $query->build();\n+\n+ // Bolt4 introduces an extra table for field values, so additional\n+ // joins is required.\n+ $query->doReferenceJoins();\n+ $query->doFieldJoins();\n+\n$query\n->getQueryBuilder()\n->andWhere('content.contentType = :ct')\n->setParameter('ct', $contentType)\n;\n- // $this->setWhereParameters($query->getQueryBuilder(), $qb, $repo, $contentQuery->getParameters());\n- $this->setWhereParameters($query->getQueryBuilder(), $contentQuery);\n-\n- $result = $query->getQueryBuilder()->getQuery()->getResult();\n+ $result = $query\n+ ->getQueryBuilder()\n+ ->getQuery()\n+ ->getResult()\n+ ;\nif ($result) {\n$set->setOriginalQuery($contentType, $query);\n@@ -71,80 +75,4 @@ class SelectQueryHandler\nreturn $set;\n}\n-\n- private $coreFields = [\n- 'id',\n- 'createdAt',\n- 'modifiedAt',\n- 'publishedAt',\n- 'depublishedAt',\n- // 'authorId', // references are to be handled differently!\n- 'status',\n- ];\n-\n- private function cleanParameters(array $params): array\n- {\n- $cleanParams = [];\n-\n- foreach ($params as $key => $value) {\n- if (in_array($key, $this->coreFields)) {\n- $cleanParams[$key] = $value;\n- }\n- }\n-\n- return $cleanParams;\n- }\n-\n- // `QueryParameterParser`\n- private function setWhereParameters(QueryBuilder $q, ContentQueryParser $contentQuery)\n- {\n- // todo: Check if a key is a column in the `bolt_content` table or a row in the `bolt_fields` table.\n- // todo: Add a (default) locale check when it is ready.\n-\n- $repo = $contentQuery->getContentRepository();\n- $qb = $repo->getQueryBuilder();\n- $params = $contentQuery->getParameters();\n-\n- $index = 0;\n- foreach ($params as $key => $value) {\n- if (false) {\n- // todo: handle `|||` queries\n- } elseif (in_array($key, $this->coreFields)) {\n- // handled in `QueryParameterParser`\n- } elseif ($key === 'author') {\n- // todo: Move to `QueryParameterParser`\n- $q = $q\n- ->join('content.author', 'a')\n- ->andWhere('a.id = :author')\n- ->setParameter('author', $value)\n- ;\n- } else {\n- // todo: Move to `QueryParameterParser`\n- $contentAlias = 'content_' . $index;\n- $fieldsAlias = 'fields_' . $index;\n- $keyParam = 'field_' . $index;\n- $valueParam = 'value_' . $index;\n-\n- $q = $q\n- ->andWhere(\n- $qb->expr()->in('content.id',\n- $repo\n- ->createQueryBuilder($contentAlias)\n- ->select($contentAlias . '.id')\n- ->innerJoin($contentAlias. '.fields', $fieldsAlias)\n- ->andWhere($fieldsAlias . '.name = :' . $keyParam)\n- ->andWhere($fieldsAlias . '.value = :' . $valueParam)\n- ->getDQL()\n- )\n- )\n- ->setParameter($keyParam, $key)\n- ->setParameter($valueParam, \\GuzzleHttp\\json_encode([ $value ]))\n- ;\n-\n- $index++;\n- }\n- }\n-\n- return $q;\n- }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/QueryParameterParser.php",
"new_path": "src/Storage/Query/QueryParameterParser.php",
"diff": "@@ -8,7 +8,7 @@ use Doctrine\\ORM\\Query\\Expr;\n/**\n* Handler class to convert the DSL for content query parameters\n- * into equivalent DBAL expressions.\n+ * into equivalent ORM expressions.\n*\n* @author Ross Riley <riley.ross@gmail.com>\n*/\n@@ -67,10 +67,8 @@ class QueryParameterParser\n/**\n* Sets the select alias to be used in sql queries.\n- *\n- * @param string $alias\n*/\n- public function setAlias($alias)\n+ public function setAlias(string $alias)\n{\n$this->alias = $alias . '.';\n}\n@@ -83,7 +81,7 @@ class QueryParameterParser\n*\n* @return Filter|null\n*/\n- public function getFilter($key, $value = null)\n+ public function getFilter(string $key, $value = null)\n{\nif (!$this->expr instanceof Expr) {\nthrow new \\Exception('Cannot call method without an Expression Builder parameter set', 1);\n@@ -102,12 +100,8 @@ class QueryParameterParser\n/**\n* Handles some errors in key/value string formatting.\n- *\n- * @param string $key\n- * @param string $value\n- * @param ExpressionBuilder $expr\n*/\n- public function incorrectQueryHandler($key, $value, $expr)\n+ public function incorrectQueryHandler(string $key, $value, Expr $expr)\n{\nif (!is_string($value)) {\nreturn null;\n@@ -122,13 +116,9 @@ class QueryParameterParser\n* It looks for three pipes in the key and value and creates an OR composite\n* expression for example: 'username|||email':'fred|||pete'.\n*\n- * @param string $key\n- * @param string $value\n- * @param ExpressionBuilder $expr\n- *\n* @return Filter|null\n*/\n- public function multipleKeyAndValueHandler($key, $value, $expr)\n+ public function multipleKeyAndValueHandler(string $key, $value, Expr $expr)\n{\nif (!mb_strpos($key, '|||')) {\nreturn null;\n@@ -150,6 +140,7 @@ class QueryParameterParser\n$filterParams += $multipleValue->getParameters();\n} else {\n$val = $this->parseValue($val);\n+ // todo: check what type of field $key is\n$placeholder = $key . '_' . $count;\n$filterParams[$placeholder] = $val['value'];\n$exprMethod = $val['operator'];\n@@ -176,13 +167,9 @@ class QueryParameterParser\n* 'username': 'fred||bob'\n* 'id': '<5 && !1'\n*\n- * @param string $key\n- * @param string $value\n- * @param ExpressionBuilder $expr\n- *\n* @return Filter|null\n*/\n- public function multipleValueHandler($key, $value, $expr)\n+ public function multipleValueHandler(string $key, $value, Expr $expr)\n{\nif (!is_string($value)) {\nreturn null;\n@@ -226,13 +213,9 @@ class QueryParameterParser\n/**\n* The default handler is the last to be run and handler simple value parsing.\n*\n- * @param string $key\n* @param string|array $value\n- * @param ExpressionBuilder $expr\n- *\n- * @return Filter\n*/\n- public function defaultFilterHandler($key, $value, $expr)\n+ public function defaultFilterHandler(string $key, $value, Expr $expr): Filter\n{\n$filter = new Filter();\n$filter->setKey($key);\n@@ -276,11 +259,11 @@ class QueryParameterParser\n* 'matched' => <the pattern that the value matched>\n* ]\n*\n- * @param string $value Value to process\n+ * @param mixed $value Value to process\n*\n* @return array Parsed values\n*/\n- public function parseValue($value)\n+ public function parseValue($value): array\n{\nforeach ($this->valueMatchers as $matcher) {\n$regex = sprintf('/%s/u', $matcher['token']);\n@@ -325,7 +308,7 @@ class QueryParameterParser\n* @param array $params Options to provide to the matched param\n* @param bool $priority If set item will be prepended to start of list\n*/\n- public function addValueMatcher($token, array $params = [], $priority = null)\n+ public function addValueMatcher(string $token, array $params = [], $priority = null)\n{\nif ($priority) {\narray_unshift($this->valueMatchers, ['token' => $token, 'params' => $params]);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/SelectQuery.php",
"new_path": "src/Storage/Query/SelectQuery.php",
"diff": "@@ -35,6 +35,23 @@ class SelectQuery implements ContentQueryInterface\nprotected $replacements = [];\n/** @var bool */\nprotected $singleFetchMode = false;\n+ /** @var array */\n+ protected $coreFields = [\n+ 'id',\n+ 'createdAt',\n+ 'modifiedAt',\n+ 'publishedAt',\n+ 'depublishedAt',\n+ 'status',\n+ ];\n+ /** @var array */\n+ protected $referenceFields = [\n+ 'author',\n+ ];\n+ /** @var array */\n+ private $referenceJoins = [];\n+ /** @var array */\n+ private $fieldJoins = [];\n/**\n* Constructor.\n@@ -119,8 +136,23 @@ class SelectQuery implements ContentQueryInterface\nreturn null;\n}\n$expr = $this->qb->expr()->andX();\n+\n+ $this->referenceJoins = [];\n+ $this->fieldJoins = [];\n+\nforeach ($this->filters as $filter) {\n+ if ($filter->getExpressionObject() instanceof \\Doctrine\\ORM\\Query\\Expr\\Orx) {\n+ // todo: `|||` and `bolt_field` integration.\n+ $expr = $expr->add($filter->getExpression());\n+ } elseif (in_array($filter->getKey(), $this->coreFields, true)) {\n$expr = $expr->add($filter->getExpression());\n+ } elseif (in_array($filter->getKey(), $this->referenceFields, true)) {\n+ $this->referenceJoins[$filter->getKey()] = $filter;\n+ $expr = $expr->add($filter->getExpression());\n+ } else {\n+ // This means the value is stored in the `bolt_field` table\n+ $this->fieldJoins[$filter->getKey()] = $filter;\n+ }\n}\nreturn $expr;\n@@ -270,14 +302,65 @@ class SelectQuery implements ContentQueryInterface\nprotected function processFilters()\n{\n$this->filters = [];\n+\nforeach ($this->params as $key => $value) {\n- // $this->parser // Bolt\\Storage\\Query\\QueryParameterParser\n- // $this->parser->setAlias('_' . $this->contentType);\n$this->parser->setAlias('content');\n+\n$filter = $this->parser->getFilter($key, $value);\nif ($filter) {\n$this->addFilter($filter);\n}\n}\n}\n+\n+ /**\n+ * Allows key-value queries for `bolt_user` (id) values.\n+ */\n+ public function doReferenceJoins()\n+ {\n+ foreach ($this->referenceJoins as $key => $filter) {\n+ $this->qb->join('content.' . $key, $key);\n+ }\n+ }\n+\n+ /**\n+ * Allows key-value queries for `bolt_field` values.\n+ */\n+ public function doFieldJoins()\n+ {\n+ $index = 1;\n+ foreach ($this->fieldJoins as $key => $filter) {\n+ $contentAlias = 'content_' . $index;\n+ $fieldsAlias = 'fields_' . $index;\n+ $keyParam = 'field_' . $index;\n+ $valueParam = 'value_' . $index;\n+\n+ $originalLeftExpression = 'content.' . $key;\n+ $newLeftExpression = $fieldsAlias . '.value';\n+ $where = $filter->getExpression();\n+ $where = str_replace($originalLeftExpression, $newLeftExpression, $where);\n+\n+ $em = $this->qb->getEntityManager();\n+\n+ $this->qb\n+ ->andWhere(\n+ $this->qb->expr()->in(\n+ 'content.id',\n+ $em\n+ ->createQueryBuilder($contentAlias)\n+ ->select($contentAlias . '.id')\n+ ->from('Bolt\\Entity\\Content', $contentAlias)\n+ ->innerJoin($contentAlias . '.fields', $fieldsAlias)\n+ ->andWhere($fieldsAlias . '.name = :' . $keyParam)\n+ ->andWhere($where)\n+ ->getDQL()\n+ )\n+ )\n+ ->setParameter($keyParam, $key)\n+ ;\n+ foreach ($filter->getParameters() as $key => $value) {\n+ $this->qb->setParameter($key, \\GuzzleHttp\\json_encode([$value]));\n+ }\n+ }\n+ }\n}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Make queries work again and add small changes
|
95,132 |
30.11.2018 13:36:00
| -3,600 |
5558b9c4e79f9c968b1b7cd4b79f07260c59f9f9
|
Directly return array of `Content` instead of `QueryResultset`
|
[
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/FrontendQueryScope.php",
"new_path": "src/Storage/Query/FrontendQueryScope.php",
"diff": "@@ -78,7 +78,7 @@ class FrontendQueryScope implements QueryScopeInterface\n// Setup status to only published unless otherwise specified\n$status = $query->getParameter('status');\nif (!$status) {\n- $query->setParameter('status', 'published'); // no work??\n+ $query->setParameter('status', 'published');\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/Handler/SelectQueryHandler.php",
"new_path": "src/Storage/Query/Handler/SelectQueryHandler.php",
"diff": "@@ -17,7 +17,7 @@ class SelectQueryHandler\n/**\n* @param ContentQueryParser $contentQuery\n*\n- * @return QueryResultset|Content|false\n+ * @return Content[]|Content|false\n*/\npublic function __invoke(ContentQueryParser $contentQuery)\n{\n@@ -73,6 +73,6 @@ class SelectQueryHandler\nreturn $set->current();\n}\n- return $set;\n+ return $set->get();\n}\n}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Directly return array of `Content` instead of `QueryResultset`
|
95,132 |
30.11.2018 16:32:49
| -3,600 |
15c523e5b13cd453f0433b3a4daa6f53e7918e48
|
Remove `NativeSearchHandler` (for now)
|
[
{
"change_type": "DELETE",
"old_path": "src/Storage/Query/Adapter/PostgresSearch.php",
"new_path": null,
"diff": "-<?php\n-\n-declare(strict_types=1);\n-\n-namespace Bolt\\Storage\\Query\\Adapter;\n-\n-use Bolt\\Storage\\Query\\SearchConfig;\n-use Doctrine\\DBAL\\Query\\QueryBuilder;\n-\n-/**\n- * Handler to build a fulltext search query for Postgres.\n- */\n-class PostgresSearch\n-{\n- protected $qb;\n- protected $config;\n- protected $searchWords;\n- protected $contentType;\n-\n- public function __construct(QueryBuilder $qb, SearchConfig $config, array $searchWords)\n- {\n- $this->qb = $qb;\n- $this->config = $config;\n- $this->searchWords = $searchWords;\n- }\n-\n- public function setContentType($type)\n- {\n- $this->contentType = $type;\n- }\n-\n- public function getQuery()\n- {\n- $words = implode('&', $this->searchWords);\n- $sub = clone $this->qb;\n- $this->qb->addSelect(\"ts_rank(bsearch.document, to_tsquery('\" . $words . \"')) as score\");\n- $sub->select('*');\n- $select = [];\n-\n- $fieldsToSearch = $this->config->getConfig($this->contentType);\n- $joins = $this->config->getJoins($this->contentType);\n- $fieldsToSearch = array_diff_key($fieldsToSearch, array_flip($joins));\n-\n- $from = $this->qb->getQueryPart('from');\n- if (isset($from[0]['alias'])) {\n- $alias = $from[0]['alias'];\n- } else {\n- $alias = $from[0]['table'];\n- }\n- foreach ($fieldsToSearch as $fieldName => $config) {\n- $weight = $this->getWeight($config['weight']);\n- $select[] = \"setweight(to_tsvector($alias.$fieldName), '$weight')\";\n- }\n- $sub->select('*, ' . implode(' || ', $select) . ' AS document');\n- $sub->groupBy(\"$alias.id\");\n-\n- $this->qb->from('(' . $sub->getSQL() . ')', 'bsearch');\n-\n- $this->qb->where(\"bsearch.document @@ to_tsquery('\" . $words . \"')\");\n- $this->qb->orderBy('score', 'DESC');\n-\n- return $this->qb;\n- }\n-\n- public function getWeight($score)\n- {\n- switch (true) {\n- case $score >= 75:\n- return 'A';\n-\n- case $score >= 50:\n- return 'B';\n-\n- case $score >= 25:\n- return 'C';\n-\n- case $score < 25:\n- return 'D';\n- }\n-\n- return 'A';\n- }\n-}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/ContentQueryParser.php",
"new_path": "src/Storage/Query/ContentQueryParser.php",
"diff": "@@ -19,7 +19,6 @@ use Bolt\\Storage\\Query\\Directive\\ReturnSingleDirective;\nuse Bolt\\Storage\\Query\\Handler\\FirstQueryHandler;\nuse Bolt\\Storage\\Query\\Handler\\IdentifiedSelectHandler;\nuse Bolt\\Storage\\Query\\Handler\\LatestQueryHandler;\n-use Bolt\\Storage\\Query\\Handler\\NativeSearchHandler;\nuse Bolt\\Storage\\Query\\Handler\\SearchQueryHandler;\nuse Bolt\\Storage\\Query\\Handler\\SelectQueryHandler;\n@@ -45,7 +44,7 @@ class ContentQueryParser\n/** @var string */\nprotected $identifier;\n/** @var array */\n- protected $operations = ['search', 'latest', 'first', 'nativesearch'];\n+ protected $operations = ['search', 'latest', 'first'];\n/** @var array */\nprotected $directives = [];\n/** @var callable[] */\n@@ -83,7 +82,6 @@ class ContentQueryParser\n$this->addHandler('search', new SearchQueryHandler());\n$this->addHandler('first', new FirstQueryHandler());\n$this->addHandler('latest', new LatestQueryHandler());\n- $this->addHandler('nativesearch', new NativeSearchHandler());\n$this->addHandler('namedselect', new IdentifiedSelectHandler());\n$this->addDirectiveHandler('getquery', new GetQueryDirective());\n"
},
{
"change_type": "DELETE",
"old_path": "src/Storage/Query/Handler/NativeSearchHandler.php",
"new_path": null,
"diff": "-<?php\n-\n-declare(strict_types=1);\n-\n-namespace Bolt\\Storage\\Query\\Handler;\n-\n-use Bolt\\Storage\\Query\\Adapter\\PostgresSearch;\n-use Bolt\\Storage\\Query\\ContentQueryParser;\n-use Bolt\\Storage\\Query\\SearchQueryResultset;\n-\n-/**\n- * Handler class to perform a native search where the db adapter supports full-text\n- * language searching, thus avoiding the need to weight the results in PHP code.\n- */\n-class NativeSearchHandler\n-{\n- /**\n- * @param ContentQueryParser $contentQuery\n- *\n- * @return SearchQueryResultset\n- */\n- public function __invoke(ContentQueryParser $contentQuery)\n- {\n- $params = $contentQuery->getEntityManager()->createQueryBuilder()->getConnection()->getParams();\n- if (mb_strpos($params['driver'], 'postgres') !== false) {\n- return $this->postgresSearch($contentQuery);\n- }\n-\n- return call_user_func($contentQuery->getHandler('search'), $contentQuery);\n- }\n-\n- /**\n- * @param ContentQueryParser $contentQuery\n- *\n- * @return SearchQueryResultset\n- */\n- public function postgresSearch(ContentQueryParser $contentQuery)\n- {\n- $set = new SearchQueryResultset();\n-\n- foreach ($contentQuery->getContentTypes() as $contentType) {\n- $repo = $contentQuery->getEntityManager()->getRepository($contentType);\n- $query = $repo->createQueryBuilder($contentType);\n- $config = $contentQuery->getService('search_config');\n- $search = $contentQuery->getParameter('filter');\n- $adapter = new PostgresSearch($query, $config, explode(' ', $search));\n- $adapter->setContentType($contentType);\n- $result = $repo->findWith($adapter->getQuery());\n- $set->add($result, $contentType);\n- }\n-\n- return $set;\n- }\n-}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Remove `NativeSearchHandler` (for now)
|
95,132 |
30.11.2018 16:42:24
| -3,600 |
09a2870350bcc14e6495cd05d1ebbb194658d7f2
|
Add some more type-hinting
There are still a bunch of things that are not implemented yet, so
not sure whether to remove them and add them later. Or keep them,
and modify/delete them later.
|
[
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/ContentQueryInterface.php",
"new_path": "src/Storage/Query/ContentQueryInterface.php",
"diff": "@@ -8,27 +8,20 @@ interface ContentQueryInterface extends QueryInterface\n{\n/**\n* Returns the content type this query is executing on.\n- *\n- * @return string\n*/\n- public function getContentType();\n+ public function getContentType(): string;\n/**\n* Returns the value of a parameter by key name.\n*\n- * @param string $key\n- *\n* @return mixed\n*/\n- public function getParameter($key);\n+ public function getParameter(string $key);\n/**\n* Sets the value of a parameter by key name.\n*\n- * @param string $key\n* @param mixed $value\n- *\n- * @return mixed\n*/\n- public function setParameter($key, $value);\n+ public function setParameter(string $key, $value): void;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/Directive/LimitDirective.php",
"new_path": "src/Storage/Query/Directive/LimitDirective.php",
"diff": "@@ -11,11 +11,7 @@ use Bolt\\Storage\\Query\\QueryInterface;\n*/\nclass LimitDirective\n{\n- /**\n- * @param QueryInterface $query\n- * @param int $limit\n- */\n- public function __invoke(QueryInterface $query, $limit)\n+ public function __invoke(QueryInterface $query, int $limit): void\n{\n$query->getQueryBuilder()->setMaxResults($limit);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/Directive/OffsetDirective.php",
"new_path": "src/Storage/Query/Directive/OffsetDirective.php",
"diff": "@@ -11,12 +11,7 @@ use Bolt\\Storage\\Query\\SelectQuery;\n*/\nclass OffsetDirective\n{\n- /**\n- * @param SelectQuery $query\n- * @param $page\n- * @param $otherDirectives\n- */\n- public function __invoke(SelectQuery $query, $page, $otherDirectives)\n+ public function __invoke(SelectQuery $query, int $page, array $otherDirectives): void\n{\n$limit = $otherDirectives['limit'] ? $otherDirectives['limit'] : 0;\n$query->getQueryBuilder()->setFirstResult(($page - 1) * $limit);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/FrontendQueryScope.php",
"new_path": "src/Storage/Query/FrontendQueryScope.php",
"diff": "@@ -28,7 +28,7 @@ class FrontendQueryScope implements QueryScopeInterface\npublic function __construct(Config $config)\n{\n$this->config = $config;\n- $this->parseContenttypes();\n+ $this->parseContentTypes();\n}\n/**\n@@ -50,7 +50,7 @@ class FrontendQueryScope implements QueryScopeInterface\n/**\n* Iterates over the main config and sets up what the default ordering should be.\n*/\n- protected function parseContenttypes()\n+ protected function parseContentTypes()\n{\n$contentTypes = $this->config->get('contenttypes');\nforeach ($contentTypes as $type => $values) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/SearchConfig.php",
"new_path": "src/Storage/Query/SearchConfig.php",
"diff": "@@ -29,7 +29,7 @@ class SearchConfig\npublic function __construct(Config $config)\n{\n$this->config = $config;\n- $this->parseContenttypes();\n+ $this->parseContentTypes();\n}\n/**\n@@ -77,7 +77,7 @@ class SearchConfig\n* Iterates over the main config and delegates weighting to both\n* searchable columns and searchable taxonomies.\n*/\n- protected function parseContenttypes()\n+ protected function parseContentTypes()\n{\n$contentTypes = $this->config->get('contenttypes');\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/SelectQuery.php",
"new_path": "src/Storage/Query/SelectQuery.php",
"diff": "@@ -67,28 +67,22 @@ class SelectQuery implements ContentQueryInterface\n/**\n* Sets the ContentType that this query will run against.\n- *\n- * @param string $contentType\n*/\n- public function setContentType($contentType)\n+ public function setContentType(string $contentType)\n{\n$this->contentType = $contentType;\n}\n/**\n* Gets the ContentType that this query will run against.\n- *\n- * @return string\n*/\n- public function getContentType()\n+ public function getContentType(): string\n{\nreturn $this->contentType;\n}\n/**\n* Sets the parameters that will filter / alter the query.\n- *\n- * @param array $params\n*/\npublic function setParameters(array $params)\n{\n@@ -99,11 +93,9 @@ class SelectQuery implements ContentQueryInterface\n/**\n* Getter to allow access to a set parameter.\n*\n- * @param $name\n- *\n* @return array|null\n*/\n- public function getParameter($name)\n+ public function getParameter(string $name)\n{\nif (array_key_exists($name, $this->params)) {\nreturn $this->params[$name];\n@@ -115,10 +107,9 @@ class SelectQuery implements ContentQueryInterface\n/**\n* Setter to allow writing to a named parameter.\n*\n- * @param string $name\n* @param mixed $value\n*/\n- public function setParameter($name, $value)\n+ public function setParameter(string $name, $value): void\n{\n$this->params[$name] = $value;\n$this->processFilters();\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Add some more type-hinting
There are still a bunch of things that are not implemented yet, so
not sure whether to remove them and add them later. Or keep them,
and modify/delete them later.
|
95,132 |
03.12.2018 14:15:11
| -3,600 |
61c5a08adc59592ed3a45b21bf1cad59003b8208
|
Fix some more ECS issues
|
[
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/ContentQueryParser.php",
"new_path": "src/Storage/Query/ContentQueryParser.php",
"diff": "@@ -4,10 +4,10 @@ declare(strict_types=1);\nnamespace Bolt\\Storage\\Query;\n+use Bolt\\Entity\\Content;\nuse Bolt\\Events\\QueryEvent;\nuse Bolt\\Events\\QueryEvents;\nuse Bolt\\Repository\\ContentRepository;\n-use Bolt\\Storage\\Entity\\Content;\nuse Bolt\\Storage\\Query\\Directive\\GetQueryDirective;\nuse Bolt\\Storage\\Query\\Directive\\HydrateDirective;\nuse Bolt\\Storage\\Query\\Directive\\LimitDirective;\n@@ -19,7 +19,6 @@ use Bolt\\Storage\\Query\\Directive\\ReturnSingleDirective;\nuse Bolt\\Storage\\Query\\Handler\\FirstQueryHandler;\nuse Bolt\\Storage\\Query\\Handler\\IdentifiedSelectHandler;\nuse Bolt\\Storage\\Query\\Handler\\LatestQueryHandler;\n-use Bolt\\Storage\\Query\\Handler\\SearchQueryHandler;\nuse Bolt\\Storage\\Query\\Handler\\SelectQueryHandler;\n/**\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/Directive/ReturnSingleDirective.php",
"new_path": "src/Storage/Query/Directive/ReturnSingleDirective.php",
"diff": "@@ -5,6 +5,7 @@ declare(strict_types=1);\nnamespace Bolt\\Storage\\Query\\Directive;\nuse Bolt\\Storage\\Query\\QueryInterface;\n+use Bolt\\Storage\\Query\\SelectQuery;\n/**\n* Directive to specify that a single object, rather than an array should be returned.\n@@ -14,6 +15,8 @@ class ReturnSingleDirective\npublic function __invoke(QueryInterface $query): void\n{\n$query->getQueryBuilder()->setMaxResults(1);\n+ if ($query instanceof SelectQuery) {\n$query->setSingleFetchMode(true);\n}\n}\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/Handler/SelectQueryHandler.php",
"new_path": "src/Storage/Query/Handler/SelectQueryHandler.php",
"diff": "@@ -4,7 +4,7 @@ declare(strict_types=1);\nnamespace Bolt\\Storage\\Query\\Handler;\n-use Bolt\\Storage\\Entity\\Content;\n+use Bolt\\Entity\\Content;\nuse Bolt\\Storage\\Query\\ContentQueryParser;\nuse Bolt\\Storage\\Query\\QueryResultset;\nuse Bolt\\Storage\\Query\\SelectQuery;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/Query.php",
"new_path": "src/Storage/Query/Query.php",
"diff": "@@ -4,7 +4,7 @@ declare(strict_types=1);\nnamespace Bolt\\Storage\\Query;\n-use Bolt\\Storage\\Entity\\Content;\n+use Bolt\\Entity\\Content;\nuse Bolt\\Twig\\TwigRecordsView;\nclass Query\n@@ -52,12 +52,9 @@ class Query\n* Used by the twig command {% setcontent %} but also directly.\n* For reference refer to @link https://docs.bolt.cm/templating/content-fetching\n*\n- * @param string $textQuery\n- * @param array|string $parameters\n- *\n* @return QueryResultset|Content|null\n*/\n- public function getContent($textQuery, array $parameters = [])\n+ public function getContent(string $textQuery, array $parameters = [])\n{\n$this->parser->setQuery($textQuery);\n$this->parser->setParameters($parameters);\n@@ -66,11 +63,12 @@ class Query\n}\n/**\n- * @return boolean|null|QueryResultset\n+ * @return bool|QueryResultset|null\n*/\npublic function getContentByScope(string $scopeName, string $textQuery, array $parameters = [])\n{\n- if ($scope = $this->getScope($scopeName)) {\n+ $scope = $this->getScope($scopeName);\n+ if ($scope) {\n$this->parser->setQuery($textQuery);\n$this->parser->setParameters($parameters);\n$this->parser->setScope($scope);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/QueryParameterParser.php",
"new_path": "src/Storage/Query/QueryParameterParser.php",
"diff": "@@ -20,7 +20,7 @@ class QueryParameterParser\nprotected $key;\n/** @var mixed */\nprotected $value;\n- /** @var ExpressionBuilder */\n+ /** @var Expr */\nprotected $expr;\n/** @var array */\nprotected $valueMatchers = [];\n@@ -29,8 +29,6 @@ class QueryParameterParser\n/**\n* Constructor.\n- *\n- * @param ExpressionBuilder $expr\n*/\npublic function __construct(Expr $expr)\n{\n@@ -202,6 +200,8 @@ class QueryParameterParser\n$values = preg_split('/ *(&&|\\|\\|) */', $value, -1, PREG_SPLIT_DELIM_CAPTURE);\n$op = $values[1];\n+ $comparison = 'andX';\n+\nif ($op === '&&') {\n$comparison = 'andX';\n} elseif ($op === '||') {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/SelectQuery.php",
"new_path": "src/Storage/Query/SelectQuery.php",
"diff": "@@ -4,7 +4,7 @@ declare(strict_types=1);\nnamespace Bolt\\Storage\\Query;\n-use Doctrine\\ORM\\Connection;\n+use Doctrine\\DBAL\\Connection;\nuse Doctrine\\ORM\\Query\\Expr\\Composite;\nuse Doctrine\\ORM\\QueryBuilder;\n@@ -89,8 +89,6 @@ class SelectQuery implements ContentQueryInterface\n/**\n* Getter to allow access to a set parameter.\n- *\n- * @return mixed\n*/\npublic function getParameter(string $name)\n{\n@@ -212,6 +210,7 @@ class SelectQuery implements ContentQueryInterface\n$query->where($this->getWhereExpression());\n}\nforeach ($this->getWhereParameters() as $key => $param) {\n+ // xiao: `Connection::PARAM_STR_ARRAY` seems incorrect to me\n$query->setParameter($key, $param, is_array($param) ? Connection::PARAM_STR_ARRAY : null);\n}\n@@ -269,7 +268,7 @@ class SelectQuery implements ContentQueryInterface\n* the QueryParameterParser. This allows complicated expressions to\n* be turned into simple sql expressions.\n*\n- * @throws \\Bolt\\Exception\\QueryParseException\n+ * @throws \\Exception\n*/\nprotected function processFilters(): void\n{\n@@ -290,7 +289,7 @@ class SelectQuery implements ContentQueryInterface\n*/\npublic function doReferenceJoins(): void\n{\n- foreach ($this->referenceJoins as $key => $filter) {\n+ foreach (array_keys($this->referenceJoins) as $key) {\n$this->qb->join('content.' . $key, $key);\n}\n}\n@@ -305,7 +304,6 @@ class SelectQuery implements ContentQueryInterface\n$contentAlias = 'content_' . $index;\n$fieldsAlias = 'fields_' . $index;\n$keyParam = 'field_' . $index;\n- $valueParam = 'value_' . $index;\n$originalLeftExpression = 'content.' . $key;\n$newLeftExpression = $fieldsAlias . '.value';\n@@ -319,7 +317,7 @@ class SelectQuery implements ContentQueryInterface\n$this->qb->expr()->in(\n'content.id',\n$em\n- ->createQueryBuilder($contentAlias)\n+ ->createQueryBuilder()\n->select($contentAlias . '.id')\n->from(\\Bolt\\Entity\\Content::class, $contentAlias)\n->innerJoin($contentAlias . '.fields', $fieldsAlias)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/SetcontentExtension.php",
"new_path": "src/Twig/SetcontentExtension.php",
"diff": "@@ -17,13 +17,10 @@ class SetcontentExtension extends AbstractExtension\n{\n/** @var Query */\nprivate $queryEngine;\n- /** @var MetadataDriver */\n- private $metadataDriver;\n- public function __construct(Query $queryEngine, ?MetadataDriver $metadataDriver = null)\n+ public function __construct(Query $queryEngine)\n{\n$this->queryEngine = $queryEngine;\n- $this->metadataDriver = $metadataDriver; // still needed?\n}\n/**\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/TwigRecordsView.php",
"new_path": "src/Twig/TwigRecordsView.php",
"diff": "@@ -4,11 +4,8 @@ declare(strict_types=1);\nnamespace Bolt\\Twig;\n-// use Bolt\\Storage\\Entity\\Content;\n-// use Bolt\\Storage\\Field\\Collection\\FieldCollection;\n-use Bolt\\Storage\\Mapping\\MetadataDriver;\n+use Bolt\\Entity\\Content;\nuse Bolt\\Storage\\Query\\QueryResultset;\n-// use ParsedownExtra;\nuse Twig\\Markup;\n/**\n@@ -20,17 +17,14 @@ use Twig\\Markup;\n*/\nclass TwigRecordsView\n{\n- /** @var MetadataDriver */\n- protected $metadata;\n/** @var array */\nprotected $transformers = [];\n/**\n* Constructor.\n*/\n- public function __construct(?MetadataDriver $metadata = null)\n+ public function __construct()\n{\n- $this->metadata = $metadata;\n$this->setupDefaults();\n}\n@@ -49,27 +43,6 @@ class TwigRecordsView\n$this->addTransformer('textarea', function ($value) {\nreturn new Markup($value, 'UTF-8');\n});\n- $this->addTransformer('markdown', function ($value) {\n- $markdown = new ParsedownExtra();\n- $value = $markdown->text($value);\n-\n- return new Markup($value, 'UTF-8');\n- });\n-\n- // $this->addTransformer('repeater', function ($value) {\n- // /** @var FieldCollection $collection */\n- // foreach ($value as $collection) {\n- // foreach ($collection as $field) {\n- // $field->setValue($this->transform($field->getValue(), $field->getFieldType()));\n- // }\n- // }\n-\n- // return $value;\n- // });\n-\n- // $this->addTransformer('block', function ($value) {\n- // return $this->transform($value, 'repeater');\n- // });\n}\n/**\n@@ -95,8 +68,9 @@ class TwigRecordsView\n$values = $record->getValues();\nif (is_array($values)) {\nforeach ($values as $field => $value) {\n- $type = $this->metadata->getFieldMetadata((string) $record->getContenttype(), $field);\n- $boltType = $type['data']['type'];\n+ /* Get type of a field based on $record->getContenttype() and $field */\n+ $type = '';\n+ $boltType = '';\n$record->set($field, $this->transform($value, $boltType, $type));\n}\n}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Fix some more ECS issues
|
95,132 |
03.12.2018 16:20:17
| -3,600 |
16b985f162e6c28ece0e207ad2f6d0795eb3760a
|
Re-writing these seems not worth it
|
[
{
"change_type": "MODIFY",
"old_path": "easy-coding-standard.yml",
"new_path": "easy-coding-standard.yml",
"diff": "@@ -105,3 +105,6 @@ parameters:\n- 'PhpCsFixer\\Fixer\\Whitespace\\BlankLineBeforeStatementFixer'\n- 'SlevomatCodingStandard\\Sniffs\\TypeHints\\TypeHintDeclarationSniff'\n- 'Symplify\\CodingStandard\\Sniffs\\Debug\\CommentedOutCodeSniff' #to be removed after beta release\n+ skip:\n+ # assignment in \"while ($var = ...)\" are ok\n+ PHP_CodeSniffer\\Standards\\Generic\\Sniffs\\CodeAnalysis\\AssignmentInConditionSniff.FoundInWhileCondition:\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Re-writing these seems not worth it
|
95,132 |
13.12.2018 17:32:59
| -3,600 |
5eba811a08428593b0521ff32db42d69d2b0e155
|
Fix changes as per review
|
[
{
"change_type": "MODIFY",
"old_path": "easy-coding-standard.yml",
"new_path": "easy-coding-standard.yml",
"diff": "@@ -105,6 +105,3 @@ parameters:\n- 'PhpCsFixer\\Fixer\\Whitespace\\BlankLineBeforeStatementFixer'\n- 'SlevomatCodingStandard\\Sniffs\\TypeHints\\TypeHintDeclarationSniff'\n- 'Symplify\\CodingStandard\\Sniffs\\Debug\\CommentedOutCodeSniff' #to be removed after beta release\n- skip:\n- # assignment in \"while ($var = ...)\" are ok\n- PHP_CodeSniffer\\Standards\\Generic\\Sniffs\\CodeAnalysis\\AssignmentInConditionSniff.FoundInWhileCondition:\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/Directive/OrderDirective.php",
"new_path": "src/Storage/Query/Directive/OrderDirective.php",
"diff": "@@ -25,7 +25,7 @@ class OrderDirective\npublic function __invoke(QueryInterface $query, string $order): void\n{\n- if (! $order) {\n+ if ($order === '') {\nreturn;\n}\n@@ -63,7 +63,7 @@ class OrderDirective\n}\n}\n- protected function getOrderBys($order): array\n+ protected function getOrderBys(string $order): array\n{\n$separatedOrders = [$order];\n@@ -74,7 +74,7 @@ class OrderDirective\nreturn $separatedOrders;\n}\n- protected function isMultiOrderQuery($order): bool\n+ protected function isMultiOrderQuery(string $order): bool\n{\nreturn mb_strpos($order, ',') !== false;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/Filter.php",
"new_path": "src/Storage/Query/Filter.php",
"diff": "@@ -23,7 +23,7 @@ class Filter\n/**\n* Sets the key that this filter affects.\n*\n- * @param string $key\n+ * @param string|array $key\n*/\npublic function setKey($key): void\n{\n@@ -32,8 +32,10 @@ class Filter\n/**\n* Getter for key.\n+ *\n+ * @return string|array\n*/\n- public function getKey(): string\n+ public function getKey()\n{\nreturn $this->key;\n}\n@@ -84,10 +86,8 @@ class Filter\n/**\n* Helper method to check if parameters are set for a specific key.\n- *\n- * @param string $param\n*/\n- public function hasParameter($param): bool\n+ public function hasParameter(string $param): bool\n{\nreturn array_key_exists($param, $this->parameters);\n}\n@@ -95,9 +95,9 @@ class Filter\n/**\n* Allows setting a parameter for a single key.\n*\n- * @param string $param\n+ * @param mixed $value\n*/\n- public function setParameter($param, $value): void\n+ public function setParameter(string $param, $value): void\n{\n$this->parameters[$param] = $value;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/FrontendQueryScope.php",
"new_path": "src/Storage/Query/FrontendQueryScope.php",
"diff": "@@ -15,8 +15,8 @@ use Bolt\\Storage\\Query\\Directive\\OrderDirective;\n*/\nclass FrontendQueryScope implements QueryScopeInterface\n{\n- /** @var array|Config */\n- protected $config = [];\n+ /** @var Config */\n+ protected $config;\n/** @var array */\nprotected $orderBys = [];\n@@ -31,18 +31,14 @@ class FrontendQueryScope implements QueryScopeInterface\n/**\n* Get the default order setting for a given content type.\n- *\n- * @param string $contentType\n- *\n- * @return array|false\n*/\n- public function getOrder($contentType)\n+ public function getOrder(string $contentType): array\n{\nif (isset($this->orderBys[$contentType])) {\nreturn $this->orderBys[$contentType];\n}\n- return false;\n+ return [];\n}\n/**\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/Handler/IdentifiedSelectHandler.php",
"new_path": "src/Storage/Query/Handler/IdentifiedSelectHandler.php",
"diff": "@@ -4,10 +4,13 @@ declare(strict_types=1);\nnamespace Bolt\\Storage\\Query\\Handler;\n+use Bolt\\Entity\\Content;\nuse Bolt\\Storage\\Query\\ContentQueryParser;\n/**\n* Handler to fetch a single record if an identifier is set in the query.\n+ *\n+ * @return bool|Content\n*/\nclass IdentifiedSelectHandler\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/Handler/LatestQueryHandler.php",
"new_path": "src/Storage/Query/Handler/LatestQueryHandler.php",
"diff": "@@ -18,6 +18,6 @@ class LatestQueryHandler\n{\n$contentQuery->setDirective('order', '-id');\n- return call_user_func($contentQuery->getHandler('select'), $contentQuery);\n+ return $contentQuery->getHandler('select')($contentQuery);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/Handler/SelectQueryHandler.php",
"new_path": "src/Storage/Query/Handler/SelectQueryHandler.php",
"diff": "@@ -15,7 +15,7 @@ use Bolt\\Storage\\Query\\SelectQuery;\nclass SelectQueryHandler\n{\n/**\n- * @return Content[]|Content|false\n+ * @return Content[]|Content|null\n*/\npublic function __invoke(ContentQueryParser $contentQuery)\n{\n@@ -30,8 +30,8 @@ class SelectQueryHandler\n$repo = $contentQuery->getContentRepository();\n$qb = $repo->getQueryBuilder();\n$query->setQueryBuilder($qb);\n- // $query->setContentType($contentType);\n$query->setContentType('content');\n+ // $query->setAlias('content')\n$query->setParameters($contentQuery->getParameters());\n$contentQuery->runScopes($query);\n@@ -63,7 +63,7 @@ class SelectQueryHandler\nif ($query->getSingleFetchMode()) {\nif ($set->count() === 0) {\n- return false;\n+ return null;\n}\nreturn $set->current();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/Query.php",
"new_path": "src/Storage/Query/Query.php",
"diff": "@@ -26,18 +26,12 @@ class Query\n$this->scopes = [];\n}\n- /**\n- * @param string $name\n- */\n- public function addScope($name, QueryScopeInterface $scope): void\n+ public function addScope(string $name, QueryScopeInterface $scope): void\n{\n$this->scopes[$name] = $scope;\n}\n- /**\n- * @param string $name\n- */\n- public function getScope($name): ?QueryScopeInterface\n+ public function getScope(string $name): ?QueryScopeInterface\n{\nif (array_key_exists($name, $this->scopes)) {\nreturn $this->scopes[$name];\n@@ -82,9 +76,8 @@ class Query\n/**\n* Helper to be called from Twig that is passed via a TwigRecordsView rather than the raw records.\n*/\n- public function getContentForTwig($textQuery, array $parameters = [])\n+ public function getContentForTwig(string $textQuery, array $parameters = [])\n{\n- // fix BC break\nif (func_num_args() === 3) {\n$whereparameters = func_get_arg(2);\nif (is_array($whereparameters) && ! empty($whereparameters)) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/QueryInterface.php",
"new_path": "src/Storage/Query/QueryInterface.php",
"diff": "@@ -23,4 +23,6 @@ interface QueryInterface\n* Returns the current instance of QueryBuilder.\n*/\npublic function getQueryBuilder(): QueryBuilder;\n+\n+ public function __toString(): string;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/QueryParameterParser.php",
"new_path": "src/Storage/Query/QueryParameterParser.php",
"diff": "@@ -138,6 +138,8 @@ class QueryParameterParser\n* This handler processes 'triple pipe' queries as implemented in Bolt\n* It looks for three pipes in the key and value and creates an OR composite\n* expression for example: 'username|||email':'fred|||pete'.\n+ *\n+ * @param mixed $value\n*/\npublic function multipleKeyAndValueHandler(string $key, $value, Expr $expr): ?Filter\n{\n@@ -154,7 +156,7 @@ class QueryParameterParser\n$parts = [];\n$count = 1;\n- while (($key = array_shift($keys)) && ($val = array_shift($values))) {\n+ foreach(array_combine($keys, $values) as $key => $val) {\n$multipleValue = $this->multipleValueHandler($key, $val, $this->expr);\nif ($multipleValue) {\n$filter = $multipleValue->getExpression();\n@@ -174,7 +176,7 @@ class QueryParameterParser\n$filter = new Filter();\n$filter->setKey($inputKeys);\n- $filter->setExpression(call_user_func_array([$expr, 'orX'], $parts));\n+ $filter->setExpression($expr->orX(...$parts));\n$filter->setParameters($filterParams);\nreturn $filter;\n@@ -187,6 +189,8 @@ class QueryParameterParser\n* For example, this handler will correctly parse values like:\n* 'username': 'fred||bob'\n* 'id': '<5 && !1'\n+ *\n+ * @param mixed $value\n*/\npublic function multipleValueHandler(string $key, $value, Expr $expr): ?Filter\n{\n@@ -214,7 +218,7 @@ class QueryParameterParser\n$parts = [];\n$count = 1;\n- while ($val = array_shift($values)) {\n+ foreach ($values as $val) {\n$val = $this->parseValue($val);\n$placeholder = $key . '_' . $count;\n$filterParams[$placeholder] = $val['value'];\n@@ -225,7 +229,7 @@ class QueryParameterParser\n$filter = new Filter();\n$filter->setKey($key);\n- $filter->setExpression(call_user_func_array([$expr, $comparison], $parts));\n+ $filter->setExpression($expr->{$comparison}(...$parts));\n$filter->setParameters($filterParams);\nreturn $filter;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/SelectQuery.php",
"new_path": "src/Storage/Query/SelectQuery.php",
"diff": "@@ -6,6 +6,7 @@ namespace Bolt\\Storage\\Query;\nuse Doctrine\\DBAL\\Connection;\nuse Doctrine\\ORM\\Query\\Expr\\Composite;\n+use Doctrine\\ORM\\Query\\ParameterTypeInferer;\nuse Doctrine\\ORM\\QueryBuilder;\n/**\n@@ -210,8 +211,7 @@ class SelectQuery implements ContentQueryInterface\n$query->where($this->getWhereExpression());\n}\nforeach ($this->getWhereParameters() as $key => $param) {\n- // xiao: `Connection::PARAM_STR_ARRAY` seems incorrect to me\n- $query->setParameter($key, $param, is_array($param) ? Connection::PARAM_STR_ARRAY : null);\n+ $query->setParameter($key, $param, ParameterTypeInferer::inferType($param));\n}\nreturn $query;\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Fix changes as per review
|
95,132 |
14.12.2018 15:51:28
| -3,600 |
d1a8f35d886cfc18e83ace54b0af74e97f856de4
|
Run ECS check
I know that `$value` can be `string` or `integer`
|
[
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/Filter.php",
"new_path": "src/Storage/Query/Filter.php",
"diff": "@@ -94,8 +94,6 @@ class Filter\n/**\n* Allows setting a parameter for a single key.\n- *\n- * @param mixed $value\n*/\npublic function setParameter(string $param, $value): void\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/QueryParameterParser.php",
"new_path": "src/Storage/Query/QueryParameterParser.php",
"diff": "@@ -138,8 +138,6 @@ class QueryParameterParser\n* This handler processes 'triple pipe' queries as implemented in Bolt\n* It looks for three pipes in the key and value and creates an OR composite\n* expression for example: 'username|||email':'fred|||pete'.\n- *\n- * @param mixed $value\n*/\npublic function multipleKeyAndValueHandler(string $key, $value, Expr $expr): ?Filter\n{\n@@ -189,8 +187,6 @@ class QueryParameterParser\n* For example, this handler will correctly parse values like:\n* 'username': 'fred||bob'\n* 'id': '<5 && !1'\n- *\n- * @param mixed $value\n*/\npublic function multipleValueHandler(string $key, $value, Expr $expr): ?Filter\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/SelectQuery.php",
"new_path": "src/Storage/Query/SelectQuery.php",
"diff": "@@ -4,7 +4,6 @@ declare(strict_types=1);\nnamespace Bolt\\Storage\\Query;\n-use Doctrine\\DBAL\\Connection;\nuse Doctrine\\ORM\\Query\\Expr\\Composite;\nuse Doctrine\\ORM\\Query\\ParameterTypeInferer;\nuse Doctrine\\ORM\\QueryBuilder;\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Run ECS check
I know that `$value` can be `string` or `integer`
|
95,144 |
14.12.2018 19:18:52
| -3,600 |
82244abb3932d121e10b5ee8c7d335660240e112
|
Working on PHPStan issues
|
[
{
"change_type": "MODIFY",
"old_path": "public/theme/skeleton/index.twig",
"new_path": "public/theme/skeleton/index.twig",
"diff": "{% endif %}\n+ <hr>\n+ {% setcontent pages = \"pages\" %}\n+\n+ <ul>\n+ {% for page in pages %}\n+ <li><a href=\"{{ page.link }}\">{{ page.title }}</a></li>\n+ {% endfor %}\n+ </ul>\n+\n{% endblock main %}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Content/MediaFactory.php",
"new_path": "src/Content/MediaFactory.php",
"diff": "@@ -14,7 +14,6 @@ use PHPExif\\Reader\\Reader;\nuse Symfony\\Component\\DependencyInjection\\ContainerInterface;\nuse Symfony\\Component\\Finder\\SplFileInfo;\nuse Symfony\\Component\\Security\\Core\\Authentication\\Token\\Storage\\TokenStorage;\n-use Symfony\\Component\\Security\\Core\\User\\UserInterface;\nuse Symfony\\Component\\Security\\Guard\\Token\\PostAuthenticationGuardToken;\nuse Tightenco\\Collect\\Support\\Collection;\n@@ -115,7 +114,12 @@ class MediaFactory\nreturn in_array($media->getType(), ['gif', 'png', 'jpg', 'svg'], true);\n}\n- protected function getUser(): ?UserInterface\n+ /**\n+ * @todo Refactor this out!\n+ *\n+ * @return object|string|null\n+ */\n+ protected function getUser()\n{\nif (! $this->container->has('security.token_storage')) {\nthrow new \\LogicException('The SecurityBundle is not registered in your application. Try running \"composer require symfony/security-bundle\".');\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/FileEditController.php",
"new_path": "src/Controller/Backend/FileEditController.php",
"diff": "@@ -56,8 +56,6 @@ class FileEditController extends BaseController\n* @throws \\Twig_Error_Loader\n* @throws \\Twig_Error_Runtime\n* @throws \\Twig_Error_Syntax\n- *\n- * @return RedirectResponse\n*/\npublic function editFilePost(Request $request, UrlGeneratorInterface $urlGenerator): Response\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/MediaController.php",
"new_path": "src/Controller/Backend/MediaController.php",
"diff": "@@ -15,7 +15,6 @@ use Symfony\\Component\\Finder\\Finder;\nuse Symfony\\Component\\HttpFoundation\\Request;\nuse Symfony\\Component\\Routing\\Annotation\\Route;\nuse Symfony\\Component\\Security\\Csrf\\CsrfTokenManagerInterface;\n-use Tightenco\\Collect\\Support\\Collection;\nuse Webmozart\\PathUtil\\Path;\n/**\n@@ -28,7 +27,7 @@ class MediaController extends BaseController\n/** @var ObjectManager */\nprivate $manager;\n- /** @var Collection */\n+ /** @var Areas */\nprivate $areas;\n/** @var MediaFactory */\n"
},
{
"change_type": "MODIFY",
"old_path": "src/DataFixtures/ContentFixtures.php",
"new_path": "src/DataFixtures/ContentFixtures.php",
"diff": "@@ -8,6 +8,7 @@ use Bolt\\Configuration\\Config;\nuse Bolt\\Entity\\Content;\nuse Bolt\\Entity\\Field;\nuse Doctrine\\Bundle\\FixturesBundle\\Fixture;\n+use Doctrine\\Common\\Collections\\Collection;\nuse Doctrine\\Common\\DataFixtures\\DependentFixtureInterface;\nuse Doctrine\\Common\\Persistence\\ObjectManager;\nuse Faker\\Factory;\n@@ -17,7 +18,7 @@ class ContentFixtures extends Fixture implements DependentFixtureInterface\n/** @var \\Faker\\Generator */\nprivate $faker;\n- /** @var Config */\n+ /** @var Collection */\nprivate $config;\nprivate $lastTitle = null;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/Handler/SelectQueryHandler.php",
"new_path": "src/Storage/Query/Handler/SelectQueryHandler.php",
"diff": "@@ -14,10 +14,7 @@ use Bolt\\Storage\\Query\\SelectQuery;\n*/\nclass SelectQueryHandler\n{\n- /**\n- * @return Content[]|Content|null\n- */\n- public function __invoke(ContentQueryParser $contentQuery)\n+ public function __invoke(ContentQueryParser $contentQuery): ?QueryResultset\n{\n$set = new QueryResultset();\n/** @var SelectQuery $query */\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/Query/SelectQuery.php",
"new_path": "src/Storage/Query/SelectQuery.php",
"diff": "@@ -4,7 +4,7 @@ declare(strict_types=1);\nnamespace Bolt\\Storage\\Query;\n-use Doctrine\\ORM\\Query\\Expr\\Composite;\n+use Doctrine\\ORM\\Query\\Expr\\Base;\nuse Doctrine\\ORM\\Query\\ParameterTypeInferer;\nuse Doctrine\\ORM\\QueryBuilder;\n@@ -112,7 +112,7 @@ class SelectQuery implements ContentQueryInterface\n* Creates a composite expression that adds all the attached\n* filters individual expressions into a combined one.\n*/\n- public function getWhereExpression(): ?Composite\n+ public function getWhereExpression(): ?Base\n{\nif (! count($this->filters)) {\nreturn null;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/ArrayExtension.php",
"new_path": "src/Twig/ArrayExtension.php",
"diff": "@@ -16,10 +16,17 @@ use Twig\\TwigFunction;\n*/\nfinal class ArrayExtension extends AbstractExtension\n{\n- private $orderOn;\n- private $orderAscending;\n- private $orderOnSecondary;\n- private $orderAscendingSecondary;\n+ /** @var string */\n+ private $orderOn = '';\n+\n+ /** @var int */\n+ private $orderAscending = 1;\n+\n+ /** @var ?string */\n+ private $orderOnSecondary = null;\n+\n+ /** @var ?boolean */\n+ private $orderAscendingSecondary = null;\n/**\n* {@inheritdoc}\n@@ -82,11 +89,8 @@ final class ArrayExtension extends AbstractExtension\n/**\n* Sorts / orders items of an array.\n- *\n- * @param string $on\n- * @param string $onSecondary\n*/\n- public function order(array $array, $on, $onSecondary = null): array\n+ public function order(array $array, string $on, ?string $onSecondary = null): array\n{\n// If we don't get a string, we can't determine a sort order.\nif (! is_string($on)) {\n@@ -102,8 +106,8 @@ final class ArrayExtension extends AbstractExtension\nif ($onSecondary) {\n[$this->orderOnSecondary, $this->orderAscendingSecondary] = $this->getSortOrder($onSecondary);\n} else {\n- $this->orderOnSecondary = false;\n- $this->orderAscendingSecondary = false;\n+ $this->orderOnSecondary = null;\n+ $this->orderAscendingSecondary = null;\n}\nuasort($array, function ($a, $b): void {\n@@ -137,14 +141,14 @@ final class ArrayExtension extends AbstractExtension\n/**\n* Helper function for sorting an array of \\Bolt\\Legacy\\Content.\n*/\n- private function orderHelper(Content $a, Content $b): bool\n+ private function orderHelper(Content $a, Content $b): int\n{\n- $aVal = $a[$this->orderOn];\n- $bVal = $b[$this->orderOn];\n+ $aVal = $a->getField($this->orderOn);\n+ $bVal = $b->getField($this->orderOn);\n// Check the primary sorting criterion.\nif ($aVal < $bVal) {\n- return ! $this->orderAscending;\n+ return -$this->orderAscending;\n} elseif ($aVal > $bVal) {\nreturn $this->orderAscending;\n}\n@@ -153,11 +157,11 @@ final class ArrayExtension extends AbstractExtension\nreturn 0;\n}\n- $aVal = $a[$this->orderOnSecondary];\n- $bVal = $b[$this->orderOnSecondary];\n+ $aVal = $a->getField($this->orderOnSecondary);\n+ $bVal = $b->getField($this->orderOnSecondary);\nif ($aVal < $bVal) {\n- return ! $this->orderAscendingSecondary;\n+ return -$this->orderAscendingSecondary;\n} elseif ($aVal > $bVal) {\nreturn $this->orderAscendingSecondary;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/HtmlExtension.php",
"new_path": "src/Twig/HtmlExtension.php",
"diff": "@@ -7,6 +7,7 @@ namespace Bolt\\Twig;\nuse Bolt\\Utils\\Markdown;\nuse Twig\\Extension\\AbstractExtension;\nuse Twig\\TwigFilter;\n+use Twig\\TwigFunction;\n/**\n* HTML functionality Twig extension.\n@@ -28,7 +29,7 @@ class HtmlExtension extends AbstractExtension\n$safe = ['is_safe' => ['html']];\nreturn [\n- new TwigFilter('markdown', [$this, 'markdown'], $safe),\n+ new TwigFunction('markdown', [$this, 'markdown'], $safe),\n];\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/LocaleExtension.php",
"new_path": "src/Twig/LocaleExtension.php",
"diff": "@@ -14,8 +14,8 @@ use Twig_Environment;\nclass LocaleExtension extends AbstractExtension\n{\n- /** @var array */\n- private $localeCodes = [];\n+ /** @var Collection */\n+ private $localeCodes;\n/** @var Collection */\nprivate $locales;\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Working on PHPStan issues
|
95,144 |
15.12.2018 16:04:41
| -3,600 |
16765351ef0b754a1f1e3b4505de5c65a27bb68e
|
Update Font Awesome to 5.6.1
|
[
{
"change_type": "MODIFY",
"old_path": "src/Content/MenuBuilder.php",
"new_path": "src/Content/MenuBuilder.php",
"diff": "@@ -177,7 +177,7 @@ class MenuBuilder\n$menu->addChild('Maintenance', ['extras' => [\n'name' => $t->trans('caption.maintenance'),\n- 'icon' => 'fa-wrench',\n+ 'icon' => 'fa-tools',\n]]);\n$menu['Maintenance']->addChild('Bolt API', [\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_base/layout.html.twig",
"new_path": "templates/_base/layout.html.twig",
"diff": "<title>{{ block('title')|striptags }}</title>\n{% block stylesheets %}\n<link href=\"https://fonts.googleapis.com/css?family=Open+Sans:400,600|Source+Sans+Pro:300,400,600&subset=latin-ext\" rel=\"stylesheet\">\n- <link rel=\"stylesheet\" href=\"https://use.fontawesome.com/releases/v5.5.0/css/all.css\" integrity=\"sha384-B4dIYHKNBt8Bc12p+WXckhzcICo0wtJAoU8YZTY5qE0Id1GSseTk6S+L3BlXeVIU\" crossorigin=\"anonymous\">\n+ <link rel=\"stylesheet\" href=\"https://use.fontawesome.com/releases/v5.6.1/css/all.css\" integrity=\"sha384-gfdkjb5BdAXd+lj+gudLWI+BXq4IuLW5IT+brZEZsLFm++aCMlF1V92rMkPaX4PP\" crossorigin=\"anonymous\">\n{% set theme = 'theme-' ~ user.backendTheme|default('default') %}\n{{ encore_entry_link_tags('bolt') }}\n{{ encore_entry_link_tags(theme) }}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Update Font Awesome to 5.6.1
|
95,180 |
20.12.2018 10:10:24
| -3,600 |
d87eaa066774173d5dec72ef9f28b6db147000f4
|
added quick fix in for mutlselect
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "assets/js/app/editor/Components/Editor/Multiselect/Multiselect.vue",
"diff": "+<template>\n+ <div>\n+ <multiselect\n+ v-model=\"option\"\n+ track-by=\"key\"\n+ label=\"value\"\n+ :options=\"options\"\n+ :searchable=\"false\"\n+ :multiple=\"true\"\n+ :show-labels=\"false\"\n+ :limit=\"20\"\n+ >\n+ <template slot=\"singleLabel\" slot-scope=\"props\" v-if=\"name === 'status'\">\n+ <span class=\"status mr-2\" :class=\"`is-${props.option.key}`\"></span>{{props.option.key}}\n+ </template>\n+ <template slot=\"option\" slot-scope=\"props\" v-if=\"name === 'status'\">\n+ <span class=\"status mr-2\" :class=\"`is-${props.option.key}`\"></span>{{props.option.key}}\n+ </template>\n+ </multiselect>\n+ <input\n+ type=\"hidden\"\n+ :id=\"id\"\n+ :name=\"fieldName\"\n+ :form=\"form\"\n+ :value=\"option.key\"\n+ >\n+ </div>\n+</template>\n+\n+<script>\n+import Multiselect from 'vue-multiselect'\n+\n+export default {\n+ name: \"editor-select\",\n+ props: ['value', 'name', 'id', 'form', 'options'],\n+ components: { Multiselect },\n+\n+ mounted(){\n+ let key = this.value;\n+ let value = '';\n+ this.options.forEach(function(item) {\n+ if (item.key == key) {\n+ value = item.value;\n+ }\n+ });\n+\n+ this.option.key = key;\n+ this.option.value = value;\n+ },\n+\n+ data: () => {\n+ return {\n+ option: {\n+ key: null,\n+ selected: true,\n+ value: null\n+ }\n+ }\n+ },\n+\n+ computed:{\n+ fieldName(){\n+ return this.name + '[]'\n+ }\n+ }\n+};\n+</script>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/Editor/index.js",
"new_path": "assets/js/app/editor/Components/Editor/index.js",
"diff": "@@ -4,6 +4,7 @@ import Slug from './Slug/Slug';\nimport Date from './Date/Date';\nimport Select from './Select/Select';\n+import Multiselect from './Multiselect/Multiselect';\nimport Number from './Number/Number';\n@@ -20,6 +21,7 @@ export {\nNumber,\nDate,\nSelect,\n+ Multiselect,\nHtml,\nMarkdown,\nTextarea,\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/index.js",
"new_path": "assets/js/app/editor/index.js",
"diff": "@@ -12,6 +12,7 @@ import {\nNumber,\nDate,\nSelect,\n+ Multiselect,\nHtml,\nMarkdown,\nTextarea,\n@@ -34,6 +35,7 @@ new Vue({\n\"editor-number\": Number,\n\"editor-date\": Date,\n\"editor-select\": Select,\n+ \"editor-multiselect\": Multiselect,\n\"editor-html\": Html,\n\"editor-markdown\": Markdown,\n\"editor-textarea\": Textarea,\n"
},
{
"change_type": "MODIFY",
"old_path": "package-lock.json",
"new_path": "package-lock.json",
"diff": "\"dependencies\": {\n\"callsites\": {\n\"version\": \"2.0.0\",\n- \"resolved\": \"http://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz\",\n\"integrity\": \"sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=\",\n\"dev\": true\n}\n},\n\"string_decoder\": {\n\"version\": \"1.1.1\",\n- \"resolved\": \"http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz\",\n\"integrity\": \"sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==\",\n\"dev\": true,\n\"requires\": {\n},\n\"string_decoder\": {\n\"version\": \"1.1.1\",\n- \"resolved\": \"http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz\",\n\"integrity\": \"sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==\",\n\"dev\": true,\n\"requires\": {\n},\n\"string_decoder\": {\n\"version\": \"1.1.1\",\n- \"resolved\": \"http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz\",\n\"integrity\": \"sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==\",\n\"dev\": true,\n\"requires\": {\n},\n\"string_decoder\": {\n\"version\": \"1.1.1\",\n- \"resolved\": \"http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz\",\n\"integrity\": \"sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==\",\n\"dev\": true,\n\"requires\": {\n},\n\"string_decoder\": {\n\"version\": \"1.1.1\",\n- \"resolved\": \"http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz\",\n\"integrity\": \"sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==\",\n\"dev\": true,\n\"requires\": {\n},\n\"string_decoder\": {\n\"version\": \"1.1.1\",\n- \"resolved\": \"http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz\",\n\"integrity\": \"sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==\",\n\"dev\": true,\n\"requires\": {\n},\n\"string_decoder\": {\n\"version\": \"1.1.1\",\n- \"resolved\": \"http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz\",\n\"integrity\": \"sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==\",\n\"dev\": true,\n\"requires\": {\n},\n\"string_decoder\": {\n\"version\": \"1.1.1\",\n- \"resolved\": \"http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz\",\n\"integrity\": \"sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==\",\n\"dev\": true,\n\"requires\": {\n},\n\"regjsparser\": {\n\"version\": \"0.1.5\",\n- \"resolved\": \"http://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz\",\n\"integrity\": \"sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=\",\n\"dev\": true,\n\"requires\": {\n},\n\"string_decoder\": {\n\"version\": \"1.1.1\",\n- \"resolved\": \"http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz\",\n\"integrity\": \"sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==\",\n\"dev\": true,\n\"requires\": {\n},\n\"stream-browserify\": {\n\"version\": \"2.0.1\",\n- \"resolved\": \"http://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz\",\n\"integrity\": \"sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=\",\n\"dev\": true,\n\"requires\": {\n},\n\"string_decoder\": {\n\"version\": \"1.1.1\",\n- \"resolved\": \"http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz\",\n\"integrity\": \"sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==\",\n\"dev\": true,\n\"requires\": {\n},\n\"string_decoder\": {\n\"version\": \"1.1.1\",\n- \"resolved\": \"http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz\",\n\"integrity\": \"sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==\",\n\"dev\": true,\n\"requires\": {\n},\n\"string_decoder\": {\n\"version\": \"0.10.31\",\n- \"resolved\": \"http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz\",\n\"integrity\": \"sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=\",\n\"dev\": true\n},\n},\n\"string_decoder\": {\n\"version\": \"1.1.1\",\n- \"resolved\": \"http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz\",\n\"integrity\": \"sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==\",\n\"dev\": true,\n\"requires\": {\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/select.html.twig",
"new_path": "templates/_partials/fields/select.html.twig",
"diff": "{% block field %}\n{% if multiple %}\n- Multi\n+ <editor-multiselect\n+ :value=\"'{{ value }}'\"\n+ :name=\"'{{ name }}'\"\n+ :id=\"'{{ id }}'\"\n+ :options=\"{{ options|json_encode() }}\"\n+ :form=\"'{{ form }}'\"\n+ ></editor-multiselect>\n{% else %}\n<editor-select\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
added quick fix in for mutlselect
|
95,144 |
21.12.2018 17:43:02
| -3,600 |
22cd40063575c8030d0a6275a75f9f6b96a53457
|
Minor tweaks. YOLO-push
|
[
{
"change_type": "MODIFY",
"old_path": "assets/scss/init/_base.scss",
"new_path": "assets/scss/init/_base.scss",
"diff": "@@ -21,8 +21,8 @@ strong {\n.card{\nbox-shadow: $card-box-shadow;\n+ background: #FFF;\n.card-header{\n- background: transparent;\nfont-weight: $font-weight-bold;\n}\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "assets/scss/layout/_login.scss",
"diff": "+html#login {\n+ background: linear-gradient( rgba(255, 255, 255, 0.4), rgba(0, 0, 0, 0.4) ), url(https://source.unsplash.com/daily);\n+ background-position: center;\n+ background-size: cover;\n+\n+ body {\n+ background: transparent;\n+ display: flex;\n+ justify-content: center;\n+ align-items: center;\n+ }\n+\n+ .card {\n+ width: 22rem;\n+ box-shadow: 10px 10px 20px rgba(0, 0, 0, 0.4);\n+ }\n+}\n+\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/scss/layout/layout.scss",
"new_path": "assets/scss/layout/layout.scss",
"diff": "//** Layouts\n@import '_admin';\n+@import '_login';\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_base/layout.html.twig",
"new_path": "templates/_base/layout.html.twig",
"diff": "<!DOCTYPE html>\n-<html>\n+<html id=\"{% block html_id %}{% endblock %}\">\n<head>\n<meta charset=\"utf-8\">\n{% endblock %}\n</head>\n-<body>\n+<body id=\"{% block body_id %}{% endblock %}\">\n<div class=\"admin has-{{ block('container') }}\">\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_base/layout_blank.html.twig",
"new_path": "templates/_base/layout_blank.html.twig",
"diff": "<!DOCTYPE html>\n-<html>\n+<html id=\"{% block html_id %}{% endblock %}\">\n<head>\n<meta charset=\"utf-8\">\n{% endblock %}\n</head>\n-<body>\n+<body id=\"{% block body_id %}{% endblock %}\">\n{% block main %}\n{% endblock %}\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/security/login.html.twig",
"new_path": "templates/security/login.html.twig",
"diff": "{{ 'title.login'|trans }}\n{% endblock %}\n-{% block body_id 'login' %}\n-\n-{% block stylesheets %}\n- {{ parent() }}\n-\n- <style type=\"text/css\">\n- html {\n- background: linear-gradient( rgba(255, 255, 255, 0.4), rgba(0, 0, 0, 0.4) ), url(https://source.unsplash.com/daily);\n- background-position: center;\n- background-size: cover;\n- }\n-\n- body {\n- background: transparent;\n- display: flex;\n- justify-content: center;\n- align-items: center;\n- }\n-\n- .card {\n- width: 22rem;\n- box-shadow: 10px 10px 20px rgba(0, 0, 0, 0.4);\n- }\n-\n- </style>\n-{% endblock %}\n+{% block html_id 'login' %}\n{% block javascripts %}\n{{ parent() }}\n<div class=\"card\">\n<div class=\"card-header\">\n-\n<i class=\"fa fa-lock\" aria-hidden=\"true\"></i>\nBolt » Login\n</div>\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Minor tweaks. YOLO-push
|
95,113 |
21.12.2018 21:49:01
| 0 |
9b79a93d3334af036431a83c09ee9ecee47bb27b
|
set findLatest querybuilder limit
|
[
{
"change_type": "MODIFY",
"old_path": "src/Repository/ContentRepository.php",
"new_path": "src/Repository/ContentRepository.php",
"diff": "@@ -57,6 +57,7 @@ class ContentRepository extends ServiceEntityRepository\n->setParameter('ct', $contenttype['slug']);\n}\n+ $qb->setMaxResults( $amount );\n$result = $qb->getQuery()->getResult();\nreturn array_slice($result, 0, $amount);\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
set findLatest querybuilder limit
|
95,144 |
16.12.2018 16:21:01
| -3,600 |
f1894b12815efcc1e0ae129b7f6ab7c07ce6880a
|
Initial draft of working Taxonomies
|
[
{
"change_type": "MODIFY",
"old_path": "src/Configuration/Parser/ContentTypesParser.php",
"new_path": "src/Configuration/Parser/ContentTypesParser.php",
"diff": "@@ -126,6 +126,8 @@ class ContentTypesParser extends BaseParser\n// Make sure taxonomy is an array.\nif (isset($contentType['taxonomy'])) {\n$contentType['taxonomy'] = (array) $contentType['taxonomy'];\n+ } else {\n+ $contentType['taxonomy'] = [];\n}\n// when adding relations, make sure they're added by their slug. Not their 'name' or 'singular name'.\n@@ -136,6 +138,12 @@ class ContentTypesParser extends BaseParser\nunset($contentType['relations'][$relkey]);\n}\n}\n+ } else {\n+ $contentType['relations'] = [];\n+ }\n+\n+ if (!empty($contentType['relations']) || !empty($contentType['taxonomy'])) {\n+ $contentType['groups'][] = \"Relations\";\n}\nreturn $contentType;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Configuration/Parser/TaxonomyParser.php",
"new_path": "src/Configuration/Parser/TaxonomyParser.php",
"diff": "@@ -49,11 +49,14 @@ class TaxonomyParser extends BaseParser\nforeach ($taxonomy['options'] as $optionKey => $optionValue) {\nif (is_numeric($optionKey)) {\n$optionKey = $optionValue;\n+ $optionValue = Str::humanize($optionValue);\n}\n$optionKey = $slugify->slugify($optionKey);\n$options[$optionKey] = $optionValue;\n}\n$taxonomy['options'] = $options;\n+ } else {\n+ $taxonomy['options'] = [];\n}\nif (! isset($taxonomy['behaves_like'])) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/ContentEditController.php",
"new_path": "src/Controller/Backend/ContentEditController.php",
"diff": "@@ -4,9 +4,12 @@ declare(strict_types=1);\nnamespace Bolt\\Controller\\Backend;\n+use Bolt\\Configuration\\Config;\nuse Bolt\\Controller\\BaseController;\nuse Bolt\\Entity\\Content;\nuse Bolt\\Entity\\Field;\n+use Bolt\\Entity\\Taxonomy;\n+use Bolt\\Repository\\TaxonomyRepository;\nuse Carbon\\Carbon;\nuse Doctrine\\Common\\Persistence\\ObjectManager;\nuse Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\Security;\n@@ -17,6 +20,7 @@ use Symfony\\Component\\Routing\\Annotation\\Route;\nuse Symfony\\Component\\Routing\\Generator\\UrlGeneratorInterface;\nuse Symfony\\Component\\Security\\Core\\Exception\\InvalidCsrfTokenException;\nuse Symfony\\Component\\Security\\Csrf\\CsrfToken;\n+use Symfony\\Component\\Security\\Csrf\\CsrfTokenManagerInterface;\n/**\n* Class ContentEditController.\n@@ -25,6 +29,18 @@ use Symfony\\Component\\Security\\Csrf\\CsrfToken;\n*/\nclass ContentEditController extends BaseController\n{\n+ /**\n+ * @var TaxonomyRepository\n+ */\n+ private $taxonomyRepository;\n+\n+ public function __construct(TaxonomyRepository $taxonomyRepository, Config $config, CsrfTokenManagerInterface $csrfTokenManager)\n+ {\n+ $this->taxonomyRepository = $taxonomyRepository;\n+ parent::__construct($config, $csrfTokenManager);\n+ }\n+\n+\n/**\n* @Route(\"/edit/{id}\", name=\"bolt_content_edit\", methods={\"GET\"})\n*\n@@ -81,6 +97,8 @@ class ContentEditController extends BaseController\n{\n$post = $request->request->all();\n+ dump($post);\n+\n$locale = $this->getPostedLocale($post);\nif (! $content) {\n@@ -98,6 +116,12 @@ class ContentEditController extends BaseController\n$this->updateFieldFromPost($key, $postfield, $content, $locale);\n}\n+ foreach ($post['taxonomy'] as $key => $taxonomy) {\n+ $this->updateTaxonomyFromPost($key, $taxonomy, $content);\n+ }\n+\n+// dd($content);\n+\nreturn $content;\n}\n@@ -121,6 +145,27 @@ class ContentEditController extends BaseController\n}\n}\n+ private function updateTaxonomyFromPost(string $key, $taxonomy, Content $content)\n+ {\n+ $taxonomy = collect($taxonomy)->filter();\n+\n+ foreach($taxonomy as $slug) {\n+\n+// $taxonomy = $this->taxonomyRepository->findOneBy(['key' => $key, 'slug' => $slug]);\n+\n+ if ($taxonomy) {\n+ dump(\"Found!\");\n+ } else {\n+ dump(\"Create!\");\n+ $taxonomy = Taxonomy::factory($key, $slug);\n+ }\n+\n+\n+ $content->addTaxonomy($taxonomy);\n+ }\n+ }\n+\n+\nprivate function getEditLocale(Request $request, Content $content): string\n{\n$locale = $request->query->get('locale', '');\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Entity/Content.php",
"new_path": "src/Entity/Content.php",
"diff": "@@ -129,7 +129,7 @@ class Content\npublic $magiceditlink;\n/**\n- * @ORM\\ManyToMany(targetEntity=\"Bolt\\Entity\\Taxonomy\", mappedBy=\"content\")\n+ * @ORM\\ManyToMany(targetEntity=\"Bolt\\Entity\\Taxonomy\", mappedBy=\"content\", cascade={\"persist\"})\n* @ORM\\JoinTable(name=\"bolt_taxonomy_content\")\n*/\nprivate $taxonomies;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Entity/Taxonomy.php",
"new_path": "src/Entity/Taxonomy.php",
"diff": "@@ -5,6 +5,7 @@ declare(strict_types=1);\nnamespace Bolt\\Entity;\nuse ApiPlatform\\Core\\Annotation\\ApiResource;\n+use Bolt\\Helpers\\Str;\nuse Doctrine\\Common\\Collections\\ArrayCollection;\nuse Doctrine\\Common\\Collections\\Collection;\nuse Doctrine\\ORM\\Mapping as ORM;\n@@ -58,13 +59,27 @@ class Taxonomy\n* @ORM\\Column(type=\"integer\")\n* @Groups(\"public\")\n*/\n- private $sortorder;\n+ private $sortorder = 0;\npublic function __construct()\n{\n$this->content = new ArrayCollection();\n}\n+ /**\n+ * @return Taxonomy\n+ */\n+ public static function factory(string $type, string $slug, ?string $name = null): self\n+ {\n+ $taxonomy = new self();\n+\n+ $taxonomy->setType($type);\n+ $taxonomy->setSlug($slug);\n+ $taxonomy->setName($name ? $name : Str::humanize($slug));\n+\n+ return $taxonomy;\n+ }\n+\npublic function getId(): ?int\n{\nreturn $this->id;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/ContentHelperExtension.php",
"new_path": "src/Twig/ContentHelperExtension.php",
"diff": "@@ -7,6 +7,7 @@ namespace Bolt\\Twig;\nuse Bolt\\Content\\MenuBuilder;\nuse Bolt\\Entity\\Content;\nuse Bolt\\Entity\\Field;\n+use Doctrine\\ORM\\PersistentCollection;\nuse Symfony\\Component\\Translation\\TranslatorInterface;\nuse Twig\\Extension\\AbstractExtension;\nuse Twig\\TwigFunction;\n@@ -53,6 +54,7 @@ class ContentHelperExtension extends AbstractExtension\nnew TwigFunction('jsonrecords', [$this, 'jsonrecords']),\nnew TwigFunction('fieldfactory', [$this, 'fieldfactory']),\nnew TwigFunction('selectoptionsfromarray', [$this, 'selectoptionsfromarray']),\n+ new TwigFunction('taxonomyoptions', [$this, 'taxonomyoptions']),\nnew TwigFunction('icon', [$this, 'icon'], $safe),\n];\n}\n@@ -139,4 +141,29 @@ class ContentHelperExtension extends AbstractExtension\nreturn $options;\n}\n+\n+ public function taxonomyoptions($taxonomy, ?PersistentCollection $currentCollection = null)\n+ {\n+ $currentValues = [];\n+ $options = [];\n+\n+ if (is_iterable($currentCollection)) {\n+ foreach($currentCollection as $value) {\n+ if ($value->getType() == $taxonomy['slug']) {\n+ $currentValues[] = $value->getSlug();\n+ }\n+ }\n+ }\n+\n+ foreach ($taxonomy['options'] as $key => $value) {\n+ $options[] = [\n+ 'key' => $key,\n+ 'value' => $value,\n+ 'selected' => in_array($key, $currentValues, true),\n+ ];\n+ }\n+\n+ return $options;\n+ }\n+\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_macro/_macro.html.twig",
"new_path": "templates/_macro/_macro.html.twig",
"diff": "-{## Actionform #}\n-{% macro actionform(content, action, icon, text, confirmation_text) %}\n- {% if action == 'held' %}\n- {% set action = 'depublish' %}\n- {% endif %}\n- <a class=\"dropdown-item\" data-listing-cmd=\"record:{{ action }}\"><i class=\"fa {{ icon }}\"></i> {{ __(text) }}</a>\n-{% endmacro %}\n\\ No newline at end of file\n+{# Button Macro #}\n+{% macro button(label, icon, class, type) %}{% spaceless %}\n+\n+ {% set label = label|default('button')|trans %}\n+ {% set icon = icon|replace({'fa-': ''})|default('question-circle') %}\n+ {% set class = class|replace({'btn-': ''})|default('info') %}\n+ {% set type = type|default('submit') %}\n+\n+ <button type=\"{{ type }}\" class=\"btn btn-{{ class }} mb-3\">\n+ <i class=\"fas fa-{{ icon }} mr-2\"></i>\n+ {{- label -}}\n+ </button>\n+\n+{% endspaceless %}{% endmacro %}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/select.html.twig",
"new_path": "templates/_partials/fields/select.html.twig",
"diff": "></editor-multiselect>\n{% else %}\n<editor-select\n-\n:value=\"'{{ value }}'\"\n:name=\"'{{ name }}'\"\n:id=\"'{{ id }}'\"\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "templates/content/_fields.html.twig",
"diff": "+ {% for group in groups if group != 'Relations' %}\n+ <div class=\"tab-pane {% if loop.first %}show active{% endif %}\" id=\"{{group|slug}}\" role=\"tabpanel\" aria-labelledby=\"{{group|slug}}-tab\">\n+ {% for key, fielddefinition in record.definition.fields if fielddefinition.group == group %}\n+\n+ {% set type = fielddefinition.type %}\n+ {% set field = record.localisedfield(key, currentlocale, false, fielddefinition) %}\n+\n+ {% include[\n+ '_partials/fields/' ~ type ~ '.html.twig',\n+ '_partials/fields/generic.html.twig'\n+ ] with {\n+ 'field' : field,\n+ 'define' : fielddefinition\n+ } %}\n+\n+ {% endfor %}\n+ </div>\n+ {% endfor %}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "templates/content/_fields_aside.html.twig",
"diff": "+{% include '@bolt/_partials/fields/select.html.twig' with {\n+ 'label' : 'field.status' | trans,\n+ 'name' : 'status',\n+ 'value' : record.status,\n+ 'options' : record.statusoptions,\n+ 'form' : 'editcontent'\n+} %}\n+\n+{% include '@bolt/_partials/fields/date.html.twig' with {\n+ 'label' : 'field.createdAt' | trans,\n+ 'name' : 'createdAt',\n+ 'value' : record.createdAt,\n+ 'disabled' : true,\n+ 'mode' : 'datetime',\n+ 'form' : 'editcontent'\n+} %}\n+\n+{% include '@bolt/_partials/fields/date.html.twig' with {\n+ 'label' : 'field.modifiedAt' | trans,\n+ 'name' : 'modifiedAt',\n+ 'value' : record.modifiedAt,\n+ 'disabled' : true,\n+ 'mode' : 'datetime',\n+ 'form' : 'editcontent'\n+} %}\n+\n+{% include '@bolt/_partials/fields/date.html.twig' with {\n+ 'label' : 'field.publishedAt' | trans,\n+ 'name' : 'publishedAt',\n+ 'value' : record.publishedAt,\n+ 'mode' : 'datetime',\n+ 'form' : 'editcontent'\n+} %}\n+\n+{% include '@bolt/_partials/fields/date.html.twig' with {\n+ 'label' : 'field.depublishedAt' | trans,\n+ 'name' : 'depublishedAt',\n+ 'mode' : 'datetime',\n+ 'form' : 'editcontent'\n+} %}\n+\n+{% include '@bolt/_partials/fields/text.html.twig' with {\n+ 'label' : 'field.author' | trans,\n+ 'name' : 'author',\n+ 'value' : record.author.fullName,\n+ 'disabled' : true\n+} %}\n+\n+{% include '@bolt/_partials/fields/text.html.twig' with {\n+ 'label' : 'field.id' | trans,\n+ 'name' : 'id',\n+ 'value' : record.id,\n+ 'disabled' : true\n+} %}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "templates/content/_localeswitcher.html.twig",
"diff": "+{% if record.id and currentlocale %}\n+ <div class=\"card mb-3\">\n+ <div class=\"card-body\">\n+ <p>{{ 'field.current_locale'|trans }}:\n+ {{ flag(currentlocale) }}<b>{{ currentlocale }}</b>.</p>\n+ <general-language\n+ label=\"{{ 'field.switch_to_locale'|trans }}\"\n+ current=\"{{ currentlocale }}\"\n+ :locales=\"{{ contentlocales(locales) }}\"\n+ ></general-language>\n+\n+ <a href=\"{{ path('bolt_content_edit_locales', {'id': record.id}) }}\" class=\"btn btn-light btn-small\">\n+ See Localisation info\n+ </a>\n+\n+ </div>\n+ </div>\n+{% endif %}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "templates/content/_tabs.html.twig",
"diff": "+<nav>\n+ <ul class=\"nav editor__tabbar\" role=\"tablist\">\n+ {% for group in groups %}\n+ <li class=\"nav-item\">\n+ <a class=\"nav-item nav-link {% if loop.first %}active{% endif %}\" id=\"{{group|slug}}-tab\" data-toggle=\"pill\" href=\"#{{group|slug}}\" role=\"tab\" aria-controls=\"{{group|slug}}\" aria-selected=\"{% if loop.first %}true{%else%}false{% endif %}\">\n+ <span>{{group|capitalize}}</span></a>\n+ </li>\n+ {% endfor %}\n+ </ul>\n+</nav>\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "templates/content/_taxonomies.html.twig",
"diff": "+<div class=\"tab-pane\" id=\"relations\" role=\"tabpanel\" aria-labelledby=\"relations-tab\">\n+{% for taxonomy in record.definition.taxonomy %}\n+\n+ {% set definition = config.get('taxonomies/' ~ taxonomy) %}\n+ {% if definition %}\n+\n+ {% set options = taxonomyoptions(definition, record.taxonomies) %}\n+\n+ {{ definition.name }}\n+ <editor-select\n+ :value=\"''\"\n+ :name=\"'taxonomy[{{ definition.slug }}]'\"\n+ :id=\"'taxonomy-{{ definition.slug }}'\"\n+ :options=\"{{ options|json_encode() }}\"\n+ ></editor-select>\n+\n+ {#{% if definition.behaves_like == 'categories' %}#}\n+ {#cats#}\n+ {#{% endif %}#}\n+\n+ {% endif %}\n+\n+{% endfor %}\n+\n+ {#{% for group in groups %}#}\n+ {#<div class=\"tab-pane {% if loop.first %}show active{% endif %}\" id=\"{{group|slug}}\" role=\"tabpanel\" aria-labelledby=\"{{group|slug}}-tab\">#}\n+ {#{% for key, fielddefinition in record.definition.fields if fielddefinition.group == group %}#}\n+\n+ {#{% set type = fielddefinition.type %}#}\n+ {#{% set field = record.localisedfield(key, currentlocale, false, fielddefinition) %}#}\n+\n+ {#{% include[#}\n+ {#'_partials/fields/' ~ type ~ '.html.twig',#}\n+ {#'_partials/fields/generic.html.twig'#}\n+ {#] with {#}\n+ {#'field' : field,#}\n+ {#'define' : fielddefinition#}\n+ {#} %}#}\n+\n+ {#{% endfor %}#}\n+ {#</div>#}\n+ {#{% endfor %}#}\n+</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/content/edit.html.twig",
"new_path": "templates/content/edit.html.twig",
"diff": "{% extends '@bolt/_base/layout.html.twig' %}\n+{% import '@bolt/_macro/_macro.html.twig' as macro %}\n{% set alltypes = ['select'] %}\n{% for key, fielddefinition in record.definition.fields %}\n{% block topsection %}\n+ {{ dump(record.taxonomies) }}\n+\n+ {% for taxonomy in record.definition.taxonomy %}\n+\n+ {% set taxonomy = config.get('taxonomies/' ~ taxonomy) %}\n+\n+ {% if taxonomy %}\n+ {{ dump(taxonomyoptions(taxonomy, record.taxonomies)) }}\n+ {% endif %}\n+\n+ {% endfor %}\n{% endblock %}\n<input type=\"hidden\" name=\"_csrf_token\" value=\"{{ csrf_token('editrecord') }}\">\n<input type=\"hidden\" name=\"_edit_locale\" value=\"{{ currentlocale }}\">\n- <!-- fields -->\n{% set groups = record.definition.groups %}\n- <nav>\n- <ul class=\"nav editor__tabbar\" role=\"tablist\">\n- {% for group in groups %}\n- <li class=\"nav-item\">\n- <a class=\"nav-item nav-link {% if loop.first %}active{% endif %}\" id=\"{{group|slug}}-tab\" data-toggle=\"pill\" href=\"#{{group|slug}}\" role=\"tab\" aria-controls=\"{{group|slug}}\" aria-selected=\"{% if loop.first %}true{%else%}false{% endif %}\">\n- <span>{{group|capitalize}}</span></a>\n- </li>\n- {% endfor %}\n- </ul>\n- </nav>\n+\n+ {% include '@bolt/content/_tabs.html.twig' %}\n+\n<div class=\"tab-content\" id=\"nav-tabContent\">\n- {% for group in groups %}\n- <div class=\"tab-pane {% if loop.first %}show active{% endif %}\" id=\"{{group|slug}}\" role=\"tabpanel\" aria-labelledby=\"{{group|slug}}-tab\">\n- {% for key, fielddefinition in record.definition.fields %}\n- {% set type = fielddefinition.type %}\n- {% set field = record.localisedfield(key, currentlocale, false, fielddefinition) %}\n-\n- {% if fielddefinition.group == group %}\n- {% include[\n- '_partials/fields/' ~ type ~ '.html.twig',\n- '_partials/fields/generic.html.twig'\n- ] with {\n- 'field' : field,\n- 'define' : fielddefinition\n- } %}\n- {% endif %}\n+ {% include '@bolt/content/_fields.html.twig' %}\n+\n+ {% include '@bolt/content/_taxonomies.html.twig' %}\n- {% endfor %}\n- </div>\n- {% endfor %}\n</div>\n- <button type=\"submit\" class=\"btn btn-success mb-3\">\n- <i class=\"fas fa-save mr-2\"></i>\n- {{ 'action.save'|trans }}\n- </button>\n+ {{ macro.button('action.save', 'fa-save', 'success') }}\n</form>\n<div class=\"card mb-3\">\n<div class=\"card-body\">\n- <button type=\"submit\" class=\"btn btn-success mb-3\" form=\"editcontent\">\n- <i class=\"fas fa-save mr-2\"></i>\n- {{ 'action.save'|trans }}\n- </button>\n+ {{ macro.button('action.save', 'fa-save', 'success') }}\n</div>\n</div>\n- {% if record.id and currentlocale %}\n- <div class=\"card mb-3\">\n- <div class=\"card-body\">\n- <p>{{ 'field.current_locale'|trans }}:\n- {{ flag(currentlocale) }}<b>{{ currentlocale }}</b>.</p>\n- <general-language\n- label=\"{{ 'field.switch_to_locale'|trans }}\"\n- current=\"{{ currentlocale }}\"\n- :locales=\"{{ contentlocales(locales) }}\"\n- ></general-language>\n-\n- <a href=\"{{ path('bolt_content_edit_locales', {'id': record.id}) }}\" class=\"btn btn-light btn-small\">\n- See Localisation info\n- </a>\n-\n- </div>\n- </div>\n- {% endif %}\n+ {% include '@bolt/content/_localeswitcher.html.twig' %}\n<div class=\"card\">\n<div class=\"card-body\">\n-\n- {% include '@bolt/_partials/fields/select.html.twig' with {\n- 'label' : 'field.status' | trans,\n- 'name' : 'status',\n- 'value' : record.status,\n- 'options' : record.statusoptions,\n- 'form' : 'editcontent'\n- } %}\n-\n- {% include '@bolt/_partials/fields/date.html.twig' with {\n- 'label' : 'field.createdAt' | trans,\n- 'name' : 'createdAt',\n- 'value' : record.createdAt,\n- 'disabled' : true,\n- 'mode' : 'datetime',\n- 'form' : 'editcontent'\n- } %}\n-\n- {% include '@bolt/_partials/fields/date.html.twig' with {\n- 'label' : 'field.modifiedAt' | trans,\n- 'name' : 'modifiedAt',\n- 'value' : record.modifiedAt,\n- 'disabled' : true,\n- 'mode' : 'datetime',\n- 'form' : 'editcontent'\n- } %}\n-\n- {% include '@bolt/_partials/fields/date.html.twig' with {\n- 'label' : 'field.publishedAt' | trans,\n- 'name' : 'publishedAt',\n- 'value' : record.publishedAt,\n- 'mode' : 'datetime',\n- 'form' : 'editcontent'\n- } %}\n-\n- {% include '@bolt/_partials/fields/date.html.twig' with {\n- 'label' : 'field.depublishedAt' | trans,\n- 'name' : 'depublishedAt',\n- 'mode' : 'datetime',\n- 'form' : 'editcontent'\n- } %}\n-\n- {% include '@bolt/_partials/fields/text.html.twig' with {\n- 'label' : 'field.author' | trans,\n- 'name' : 'author',\n- 'value' : record.author.fullName,\n- 'disabled' : true\n- } %}\n-\n- {% include '@bolt/_partials/fields/text.html.twig' with {\n- 'label' : 'field.id' | trans,\n- 'name' : 'id',\n- 'value' : record.id,\n- 'disabled' : true\n- } %}\n-\n+ {% include '@bolt/content/_fields_aside.html.twig' %}\n</div>\n-\n</div>\n</form>\n</div>\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Initial draft of working Taxonomies
|
95,144 |
16.12.2018 18:14:32
| -3,600 |
69670221021a9e4609ebdfea7ce64a66d7c68736
|
Working on taxonomies
|
[
{
"change_type": "MODIFY",
"old_path": "src/Configuration/Parser/ContentTypesParser.php",
"new_path": "src/Configuration/Parser/ContentTypesParser.php",
"diff": "@@ -143,7 +143,7 @@ class ContentTypesParser extends BaseParser\n}\nif (! empty($contentType['relations']) || ! empty($contentType['taxonomy'])) {\n- $contentType['groups'][] = \"Relations\";\n+ $contentType['groups'][] = 'Relations';\n}\nreturn $contentType;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/ContentEditController.php",
"new_path": "src/Controller/Backend/ContentEditController.php",
"diff": "@@ -40,7 +40,6 @@ class ContentEditController extends BaseController\nparent::__construct($config, $csrfTokenManager);\n}\n-\n/**\n* @Route(\"/edit/{id}\", name=\"bolt_content_edit\", methods={\"GET\"})\n*\n@@ -145,27 +144,27 @@ class ContentEditController extends BaseController\n}\n}\n- private function updateTaxonomyFromPost(string $key, $taxonomy, Content $content)\n+ private function updateTaxonomyFromPost(string $key, $taxonomy, Content $content): void\n{\n$taxonomy = collect($taxonomy)->filter();\nforeach ($taxonomy as $slug) {\n-\n-// $taxonomy = $this->taxonomyRepository->findOneBy(['key' => $key, 'slug' => $slug]);\n+ $taxonomy = $this->taxonomyRepository->findOneBy([\n+ 'type' => $key,\n+ 'slug' => $slug,\n+ ]);\nif ($taxonomy) {\n- dump(\"Found!\");\n+ dump('Found!');\n} else {\n- dump(\"Create!\");\n+ dump('Create!');\n$taxonomy = Taxonomy::factory($key, $slug);\n}\n-\n$content->addTaxonomy($taxonomy);\n}\n}\n-\nprivate function getEditLocale(Request $request, Content $content): string\n{\n$locale = $request->query->get('locale', '');\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Entity/Taxonomy.php",
"new_path": "src/Entity/Taxonomy.php",
"diff": "@@ -75,7 +75,7 @@ class Taxonomy\n$taxonomy->setType($type);\n$taxonomy->setSlug($slug);\n- $taxonomy->setName($name ? $name : Str::humanize($slug));\n+ $taxonomy->setName($name ?: Str::humanize($slug));\nreturn $taxonomy;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/ContentHelperExtension.php",
"new_path": "src/Twig/ContentHelperExtension.php",
"diff": "@@ -55,6 +55,7 @@ class ContentHelperExtension extends AbstractExtension\nnew TwigFunction('fieldfactory', [$this, 'fieldfactory']),\nnew TwigFunction('selectoptionsfromarray', [$this, 'selectoptionsfromarray']),\nnew TwigFunction('taxonomyoptions', [$this, 'taxonomyoptions']),\n+ new TwigFunction('taxonomyvalues', [$this, 'taxonomyvalues']),\nnew TwigFunction('icon', [$this, 'icon'], $safe),\n];\n}\n@@ -142,14 +143,14 @@ class ContentHelperExtension extends AbstractExtension\nreturn $options;\n}\n- public function taxonomyoptions($taxonomy, ?PersistentCollection $currentCollection = null)\n+ public function taxonomyoptions(PersistentCollection $currentCollection, $taxonomy)\n{\n$currentValues = [];\n$options = [];\nif (is_iterable($currentCollection)) {\nforeach ($currentCollection as $value) {\n- if ($value->getType() == $taxonomy['slug']) {\n+ if ($value->getType() === $taxonomy['slug']) {\n$currentValues[] = $value->getSlug();\n}\n}\n@@ -166,4 +167,18 @@ class ContentHelperExtension extends AbstractExtension\nreturn $options;\n}\n+ public function taxonomyvalues(PersistentCollection $currentCollection, ?string $taxonomy = null)\n+ {\n+ $values = [];\n+\n+ foreach ($currentCollection as $value) {\n+ $values[$value->getType()][] = $value->getSlug();\n+ }\n+\n+ if ($taxonomy) {\n+ $values = $values[$taxonomy] ?? [];\n+ }\n+\n+ return collect($values);\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/content/_taxonomies.html.twig",
"new_path": "templates/content/_taxonomies.html.twig",
"diff": "{% set definition = config.get('taxonomies/' ~ taxonomy) %}\n{% if definition %}\n- {% set options = taxonomyoptions(definition, record.taxonomies) %}\n+ {% set options = taxonomyoptions(record.taxonomies, definition) %}\n+\n+ {% set value = taxonomyvalues(record.taxonomies, definition.slug)|first %}\n{{ definition.name }}\n<editor-select\n- :value=\"''\"\n+ :value=\"'{{ value }}'\"\n:name=\"'taxonomy[{{ definition.slug }}]'\"\n:id=\"'taxonomy-{{ definition.slug }}'\"\n:options=\"{{ options|json_encode() }}\"\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/content/edit.html.twig",
"new_path": "templates/content/edit.html.twig",
"diff": "{% block topsection %}\n- {{ dump(record.taxonomies) }}\n+ {{ dump(taxonomyvalues(record.taxonomies, 'categories')) }}\n{% for taxonomy in record.definition.taxonomy %}\n{% set taxonomy = config.get('taxonomies/' ~ taxonomy) %}\n{% if taxonomy %}\n- {{ dump(taxonomyoptions(taxonomy, record.taxonomies)) }}\n+ {{ dump(taxonomyoptions(record.taxonomies, taxonomy)) }}\n{% endif %}\n{% endfor %}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Working on taxonomies
|
95,144 |
22.12.2018 16:06:07
| -3,600 |
fafe5994f79080ad71125bd1fa89f579c9e8ed91
|
Many, many random tidbits
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "assets/scss/themes/dark.scss",
"diff": "+//** Theme | Default\n+\n+@import '../init/mixins';\n+@import '_shared';\n+\n+:root{\n+\n+ --background: #2B2B2B;\n+ --foreground: #000;\n+\n+ --status-published: #08b883;\n+ --status-draft: #1078da;\n+ --status-held: #dd2443;\n+ --status-timed: #741ce6;\n+\n+ --admin-sidebar: #3C3F41;\n+ --admin-sidebar-text: #ADADAD;\n+ --admin-sidebar-icon: #DDD;\n+ --admin-sidebar-menu: #444;\n+ --admin-sidebar-menu-text: #ffffff;\n+\n+ --admin-toolbar: #ffffff;\n+ --admin-toolbar-text-light: #ffffff;\n+ --admin-toolbar-text-dark: #0c223b;\n+\n+\n+ @include generate-color(primary, 212, 70%, 35%);\n+ @include generate-color(secondary, 212, 90%, 25%);\n+\n+ @include generate-color(body, 212, 66%, 14%);\n+ @include generate-color(shade, 208, 13%, 43%);\n+ @include generate-color(grey, 251, 20%, 92%);\n+\n+ @include generate-color(success, 152, 92%, 38%);\n+ @include generate-color(danger, 350, 73%, 50%);\n+\n+}\n+\n+$bootstrap-colors: (\n+ \"primary\",\n+ \"secondary\",\n+ \"grey\",\n+ \"success\",\n+ \"danger\"\n+);\n+\n+@import '_bootstrap';\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "assets/scss/themes/woordpers.scss",
"diff": "+//** Theme | Default\n+\n+@import '../init/mixins';\n+@import '_shared';\n+\n+:root{\n+\n+ --background: #f3f5f7;\n+ --foreground: #ffffff;\n+\n+ --status-published: #08b883;\n+ --status-draft: #1078da;\n+ --status-held: #dd2443;\n+ --status-timed: #741ce6;\n+\n+ --admin-sidebar: #ffffff;\n+ --admin-sidebar-text: #0c223b;\n+ --admin-sidebar-icon: #053b7a;\n+ --admin-sidebar-menu: #053b7a;\n+ --admin-sidebar-menu-text: #ffffff;\n+\n+ --admin-toolbar: #ffffff;\n+ --admin-toolbar-text-light: #ffffff;\n+ --admin-toolbar-text-dark: #0c223b;\n+\n+\n+ @include generate-color(primary, 212, 70%, 35%);\n+ @include generate-color(secondary, 212, 90%, 25%);\n+\n+ @include generate-color(body, 212, 66%, 14%);\n+ @include generate-color(shade, 208, 13%, 43%);\n+ @include generate-color(grey, 251, 20%, 92%);\n+\n+ @include generate-color(success, 152, 92%, 38%);\n+ @include generate-color(danger, 350, 73%, 50%);\n+\n+}\n+\n+$bootstrap-colors: (\n+ \"primary\",\n+ \"secondary\",\n+ \"grey\",\n+ \"success\",\n+ \"danger\"\n+);\n+\n+@import '_bootstrap';\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/ContentEditController.php",
"new_path": "src/Controller/Backend/ContentEditController.php",
"diff": "@@ -96,8 +96,6 @@ class ContentEditController extends BaseController\n{\n$post = $request->request->all();\n- dump($post);\n-\n$locale = $this->getPostedLocale($post);\nif (! $content) {\n@@ -119,8 +117,6 @@ class ContentEditController extends BaseController\n$this->updateTaxonomyFromPost($key, $taxonomy, $content);\n}\n-// dd($content);\n-\nreturn $content;\n}\n@@ -155,9 +151,9 @@ class ContentEditController extends BaseController\n]);\nif ($taxonomy) {\n- dump('Found!');\n+// dump('Found!');\n} else {\n- dump('Create!');\n+// dump('Create!');\n$taxonomy = Taxonomy::factory($key, $slug);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Entity/ContentMagicTraits.php",
"new_path": "src/Entity/ContentMagicTraits.php",
"diff": "@@ -5,6 +5,7 @@ declare(strict_types=1);\nnamespace Bolt\\Entity;\nuse Bolt\\Helpers\\Excerpt;\n+use Twig_Markup;\ntrait ContentMagicTraits\n{\n@@ -29,7 +30,7 @@ trait ContentMagicTraits\n// Prefer a field with $name\nforeach ($this->fields as $field) {\nif ($field->getName() === $name) {\n- return $field->isExcerptable() ? new \\Twig_Markup($field, 'UTF-8') : $field;\n+ return $field->isExcerptable() ? new Twig_Markup($field, 'UTF-8') : $field;\n}\n}\n@@ -120,7 +121,7 @@ trait ContentMagicTraits\nreturn implode(' ', $title);\n}\n- public function magicImage()\n+ public function magicImage(): array\n{\nforeach ($this->getFields() as $field) {\nif ($field->getDefinition()->get('type') === 'image') {\n@@ -128,15 +129,19 @@ trait ContentMagicTraits\n}\n}\n- return null;\n+ return [\n+ 'filename' => '',\n+ 'alt' => '',\n+ 'path' => '',\n+ ];\n}\n- public function magicExcerpt($length = 150, $includeTitle = true, $focus = null)\n+ public function magicExcerpt($length = 150, $includeTitle = true, $focus = null): Twig_Markup\n{\n$excerpter = new Excerpt($this);\n$excerpt = $excerpter->getExcerpt($length, $includeTitle, $focus);\n- return new \\Twig_Markup($excerpt, 'utf-8');\n+ return new Twig_Markup($excerpt, 'utf-8');\n}\npublic function magicPrevious()\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/content/_taxonomies.html.twig",
"new_path": "templates/content/_taxonomies.html.twig",
"diff": "{% set options = taxonomyoptions(record.taxonomies, definition) %}\n- {% set value = taxonomyvalues(record.taxonomies, definition.slug)|first %}\n+ {% set value = taxonomyvalues(record.taxonomies, definition.slug) %}\n- {{ definition.name }}\n- <editor-select\n+ {{ definition.name }} [ {{ value }} ]\n+ <editor-multiselect\n:value=\"'{{ value }}'\"\n:name=\"'taxonomy[{{ definition.slug }}]'\"\n:id=\"'taxonomy-{{ definition.slug }}'\"\n:options=\"{{ options|json_encode() }}\"\n- ></editor-select>\n+ ></editor-multiselect>\n{#{% if definition.behaves_like == 'categories' %}#}\n{#cats#}\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/content/edit.html.twig",
"new_path": "templates/content/edit.html.twig",
"diff": "{% block topsection %}\n- {{ dump(taxonomyvalues(record.taxonomies, 'categories')) }}\n-\n- {% for taxonomy in record.definition.taxonomy %}\n-\n- {% set taxonomy = config.get('taxonomies/' ~ taxonomy) %}\n-\n- {% if taxonomy %}\n- {{ dump(taxonomyoptions(record.taxonomies, taxonomy)) }}\n- {% endif %}\n-\n- {% endfor %}\n-\n{% endblock %}\n{% block main %}\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/dashboard/dashboard.html.twig",
"new_path": "templates/dashboard/dashboard.html.twig",
"diff": "<i class='fas mr-2 fa-tachometer-alt'></i><strong>{{ 'caption.dashboard'|trans }}</strong>\n{% endblock title %}\n+\n+\n{% block main %}\n+ {{ dump(records) }}\n+\n+<textarea syle=\"width: 1000px\">{{ jsonrecords(records, true) }}</textarea>\n+\n<div id=\"listing\">\n{% include '@bolt/_partials/_content_listing.html.twig' with {'records': records, 'type': 'dashboard' } %}\n</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/users/edit.html.twig",
"new_path": "templates/users/edit.html.twig",
"diff": "<select id=\"user_backendTheme\" name=\"user[backendTheme]\" class=\"form-control\">\n<option value=\"default\" selected=\"selected\">The Default theme</option>\n<option value=\"dark\">The Default Dark theme</option>\n+ <option value=\"light\">A pretty Light theme</option>\n<option value=\"woordpers\">WoordPers: Kinda looks like that other CMS</option>\n</select>\n</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "webpack.config.js",
"new_path": "webpack.config.js",
"diff": "@@ -34,6 +34,8 @@ Encore\n.addEntry('bolt', './assets/js/bolt.js')\n.addStyleEntry('theme-default', './assets/scss/themes/default.scss')\n.addStyleEntry('theme-light', './assets/scss/themes/light.scss')\n+ .addStyleEntry('theme-dark', './assets/scss/themes/dark.scss')\n+ .addStyleEntry('theme-woordpers', './assets/scss/themes/woordpers.scss')\n.splitEntryChunks()\n.autoProvidejQuery()\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Many, many random tidbits
|
95,144 |
22.12.2018 16:06:53
| -3,600 |
46408474c588332a5117dcaca98cc7a2457d2a55
|
Cleanup un twig
|
[
{
"change_type": "MODIFY",
"old_path": "templates/dashboard/dashboard.html.twig",
"new_path": "templates/dashboard/dashboard.html.twig",
"diff": "<i class='fas mr-2 fa-tachometer-alt'></i><strong>{{ 'caption.dashboard'|trans }}</strong>\n{% endblock title %}\n-\n-\n{% block main %}\n- {{ dump(records) }}\n-\n-<textarea syle=\"width: 1000px\">{{ jsonrecords(records, true) }}</textarea>\n-\n<div id=\"listing\">\n{% include '@bolt/_partials/_content_listing.html.twig' with {'records': records, 'type': 'dashboard' } %}\n</div>\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Cleanup un twig
|
95,113 |
27.12.2018 22:36:25
| 0 |
f6547432ea8eefc305a6ad4d63362fc64b34d503
|
Update ContentRepository.php
fix PHP_CodeSniffer problems and remove unnecessary array_slice
|
[
{
"change_type": "MODIFY",
"old_path": "src/Repository/ContentRepository.php",
"new_path": "src/Repository/ContentRepository.php",
"diff": "@@ -60,7 +60,7 @@ class ContentRepository extends ServiceEntityRepository\n$qb->setMaxResults($amount);\n$result = $qb->getQuery()->getResult();\n- return array_slice($result, 0, $amount);\n+ return $result;\n}\npublic function findOneBySlug(string $slug): ?Content\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Update ContentRepository.php
fix PHP_CodeSniffer problems and remove unnecessary array_slice
|
95,113 |
27.12.2018 22:43:40
| 0 |
9f1bc2ae38e8977196d0a3e64d1f9f50210815ed
|
Update ContentRepository.php
fix PHP_CodeSniffer problems
|
[
{
"change_type": "MODIFY",
"old_path": "src/Repository/ContentRepository.php",
"new_path": "src/Repository/ContentRepository.php",
"diff": "@@ -58,9 +58,7 @@ class ContentRepository extends ServiceEntityRepository\n}\n$qb->setMaxResults($amount);\n- $result = $qb->getQuery()->getResult();\n-\n- return $result;\n+ return $qb->getQuery()->getResult();\n}\npublic function findOneBySlug(string $slug): ?Content\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Update ContentRepository.php
fix PHP_CodeSniffer problems
|
95,144 |
01.01.2019 16:47:29
| -3,600 |
5de79d2b69a07e1ad370945f52093d9464ec3a02
|
Don't break if a contenttype is removed
|
[
{
"change_type": "MODIFY",
"old_path": "src/Content/ContentType.php",
"new_path": "src/Content/ContentType.php",
"diff": "@@ -20,8 +20,8 @@ final class ContentType extends Collection\n*/\npublic static function factory(string $name, $contenttypesconfig): ?self\n{\n- if ($contenttypesconfig[$name]) {\n- return new self($contenttypesconfig[$name]);\n+ if ($contenttypesconfig->get($name)) {\n+ return new self($contenttypesconfig->get($name));\n}\nforeach ($contenttypesconfig as $item => $value) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Entity/Content.php",
"new_path": "src/Entity/Content.php",
"diff": "@@ -178,6 +178,10 @@ class Content\npublic function getSummary(): array\n{\n+ if (!$this->getDefinition()) {\n+ return [];\n+ }\n+\nreturn [\n'id' => $this->getid(),\n'contenttype' => $this->getDefinition()->get('slug'),\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Don't break if a contenttype is removed
|
95,144 |
28.12.2018 19:45:49
| -3,600 |
7e1df4d3c5ff8d46331c164cf64027bfb015516d
|
Working on <select>
|
[
{
"change_type": "DELETE",
"old_path": "assets/js/app/editor/Components/Editor/Multiselect/Multiselect.vue",
"new_path": null,
"diff": "-<template>\n- <div>\n- <multiselect\n- v-model=\"option\"\n- track-by=\"key\"\n- label=\"value\"\n- :options=\"options\"\n- :searchable=\"false\"\n- :multiple=\"true\"\n- :show-labels=\"false\"\n- :limit=\"20\"\n- >\n- <template slot=\"singleLabel\" slot-scope=\"props\" v-if=\"name === 'status'\">\n- <span class=\"status mr-2\" :class=\"`is-${props.option.key}`\"></span>{{props.option.key}}\n- </template>\n- <template slot=\"option\" slot-scope=\"props\" v-if=\"name === 'status'\">\n- <span class=\"status mr-2\" :class=\"`is-${props.option.key}`\"></span>{{props.option.key}}\n- </template>\n- </multiselect>\n- <input\n- type=\"hidden\"\n- :id=\"id\"\n- :name=\"fieldName\"\n- :form=\"form\"\n- :value=\"option.key\"\n- >\n- </div>\n-</template>\n-\n-<script>\n-import Multiselect from 'vue-multiselect'\n-\n-export default {\n- name: \"editor-select\",\n- props: ['value', 'name', 'id', 'form', 'options'],\n- components: { Multiselect },\n-\n- mounted(){\n- let key = this.value;\n- let value = '';\n- this.options.forEach(function(item) {\n- if (item.key == key) {\n- value = item.value;\n- }\n- });\n-\n- this.option.key = key;\n- this.option.value = value;\n- },\n-\n- data: () => {\n- return {\n- option: {\n- key: null,\n- selected: true,\n- value: null\n- }\n- }\n- },\n-\n- computed:{\n- fieldName(){\n- return this.name + '[]'\n- }\n- }\n-};\n-</script>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/Editor/Select/Select.vue",
"new_path": "assets/js/app/editor/Components/Editor/Select/Select.vue",
"diff": ":options=\"options\"\n:searchable=\"false\"\n:show-labels=\"false\"\n- :limit=\"1\"\n+ :multiple=\"multiple\"\n+ :limit=\"1000\"\n+ @input=\"serialiseValues\"\n>\n<template slot=\"singleLabel\" slot-scope=\"props\" v-if=\"name === 'status'\">\n<span class=\"status mr-2\" :class=\"`is-${props.option.key}`\"></span>{{props.option.key}}\n</template>\n</multiselect>\n<input\n- type=\"hidden\"\n+ type=\"text\"\n:id=\"id\"\n:name=\"fieldName\"\n:form=\"form\"\n- :value=\"option.key\"\n+ :value=\"serialised\"\n>\n</div>\n</template>\n@@ -31,7 +33,7 @@ import Multiselect from 'vue-multiselect'\nexport default {\nname: \"editor-select\",\n- props: ['value', 'name', 'id', 'form', 'options'],\n+ props: ['value', 'name', 'id', 'form', 'options', 'multiple'],\ncomponents: { Multiselect },\nmounted(){\n@@ -45,6 +47,7 @@ export default {\nthis.option.key = key;\nthis.option.value = value;\n+ this.serialised = 'FIXMEEEE';\n},\ndata: () => {\n@@ -53,13 +56,32 @@ export default {\nkey: null,\nselected: true,\nvalue: null\n- }\n+ },\n+ serialised: ''\n}\n},\ncomputed: {\nfieldName() {\nreturn this.name + '[]'\n+ },\n+ },\n+\n+ methods: {\n+ serialiseValues(value) {\n+ var selected = [];\n+\n+ if (value.key) {\n+ // Single\n+ selected.push(value.key);\n+ } else {\n+ // Multiple\n+ value.forEach(function(item) {\n+ selected.push(item.key);\n+ });\n+ }\n+\n+ this.serialised = JSON.stringify(selected);\n}\n}\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/Editor/index.js",
"new_path": "assets/js/app/editor/Components/Editor/index.js",
"diff": "@@ -4,7 +4,6 @@ import Slug from './Slug/Slug';\nimport Date from './Date/Date';\nimport Select from './Select/Select';\n-import Multiselect from './Multiselect/Multiselect';\nimport Number from './Number/Number';\n@@ -21,7 +20,6 @@ export {\nNumber,\nDate,\nSelect,\n- Multiselect,\nHtml,\nMarkdown,\nTextarea,\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/index.js",
"new_path": "assets/js/app/editor/index.js",
"diff": "@@ -12,7 +12,6 @@ import {\nNumber,\nDate,\nSelect,\n- Multiselect,\nHtml,\nMarkdown,\nTextarea,\n@@ -29,13 +28,11 @@ new Vue({\nname: \"bolt-editor\",\ncomponents: {\n\"general-language\": Language,\n-\n\"editor-text\": Text,\n\"editor-slug\": Slug,\n\"editor-number\": Number,\n\"editor-date\": Date,\n\"editor-select\": Select,\n- \"editor-multiselect\": Multiselect,\n\"editor-html\": Html,\n\"editor-markdown\": Markdown,\n\"editor-textarea\": Textarea,\n"
},
{
"change_type": "MODIFY",
"old_path": "composer.lock",
"new_path": "composer.lock",
"diff": "},\n{\n\"name\": \"api-platform/core\",\n- \"version\": \"v2.3.4\",\n+ \"version\": \"v2.3.5\",\n\"source\": {\n\"type\": \"git\",\n\"url\": \"https://github.com/api-platform/core.git\",\n- \"reference\": \"a21e504406eaa5c6e3ace2c485dd534620004c96\"\n+ \"reference\": \"a73d407dd74f269fe38ee7c97b003f092a471818\"\n},\n\"dist\": {\n\"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/api-platform/core/zipball/a21e504406eaa5c6e3ace2c485dd534620004c96\",\n- \"reference\": \"a21e504406eaa5c6e3ace2c485dd534620004c96\",\n+ \"url\": \"https://api.github.com/repos/api-platform/core/zipball/a73d407dd74f269fe38ee7c97b003f092a471818\",\n+ \"reference\": \"a73d407dd74f269fe38ee7c97b003f092a471818\",\n\"shasum\": \"\"\n},\n\"require\": {\n\"php\": \">=7.1\",\n\"psr/cache\": \"^1.0\",\n\"psr/container\": \"^1.0\",\n- \"symfony/http-foundation\": \"^3.1 || ^4.0\",\n- \"symfony/http-kernel\": \"^2.7 || ^3.0 || ^4.0\",\n- \"symfony/property-access\": \"^2.7 || ^3.0 || ^4.0\",\n- \"symfony/property-info\": \"^3.3.11 || ^4.0\",\n+ \"symfony/http-foundation\": \"^3.4 || ^4.0\",\n+ \"symfony/http-kernel\": \"^3.4 || ^4.0\",\n+ \"symfony/property-access\": \"^3.4 || ^4.0\",\n+ \"symfony/property-info\": \"^3.4 || ^4.0\",\n\"symfony/serializer\": \"^4.1\",\n\"willdurand/negotiation\": \"^2.0.3\"\n},\n\"conflict\": {\n- \"symfony/dependency-injection\": \"<3.4\"\n+ \"doctrine/common\": \"<2.7\"\n},\n\"require-dev\": {\n\"behat/behat\": \"^3.1\",\n\"behatch/contexts\": \"3.1.0\",\n\"doctrine/annotations\": \"^1.2\",\n\"doctrine/doctrine-bundle\": \"^1.8\",\n- \"doctrine/orm\": \"^2.5.2\",\n+ \"doctrine/orm\": \"^2.6.3\",\n\"friendsofsymfony/user-bundle\": \"^2.1\",\n\"guzzlehttp/guzzle\": \"^6.0\",\n\"justinrainbow/json-schema\": \"^5.0\",\n\"nelmio/api-doc-bundle\": \"^2.13.3\",\n\"php-mock/php-mock-phpunit\": \"^2.0\",\n\"phpdocumentor/reflection-docblock\": \"^3.0 || ^4.0\",\n- \"phpdocumentor/type-resolver\": \"^0.2.1 || ^0.3 || 0.4\",\n+ \"phpdocumentor/type-resolver\": \"^0.3 || ^0.4\",\n\"phpunit/phpunit\": \"^6.1\",\n\"psr/log\": \"^1.0\",\n\"ramsey/uuid\": \"^3.7\",\n\"ramsey/uuid-doctrine\": \"^1.4\",\n- \"symfony/asset\": \"^3.3 || ^4.0\",\n- \"symfony/cache\": \"^3.3 || ^4.0\",\n+ \"symfony/asset\": \"^3.4 || ^4.0\",\n+ \"symfony/cache\": \"^3.4 || ^4.0\",\n\"symfony/config\": \"^3.4 || ^4.0\",\n\"symfony/console\": \"^3.4 || ^4.0\",\n- \"symfony/debug\": \"^2.8 || ^3.0 || ^4.0\",\n+ \"symfony/debug\": \"^3.4 || ^4.0\",\n\"symfony/dependency-injection\": \"^3.4 || ^4.0\",\n- \"symfony/doctrine-bridge\": \"^2.8.12 || ^3.0 || ^4.0\",\n+ \"symfony/doctrine-bridge\": \"^3.4 || ^4.0\",\n\"symfony/event-dispatcher\": \"^3.4 || ^4.0\",\n- \"symfony/expression-language\": \"^2.8 || ^3.0 || ^4.0\",\n- \"symfony/finder\": \"^3.3 || ^4.0\",\n- \"symfony/form\": \"^3.3 || ^4.0\",\n- \"symfony/framework-bundle\": \"^3.3 || ^4.0\",\n- \"symfony/phpunit-bridge\": \"^3.3 || ^4.0\",\n- \"symfony/routing\": \"^3.3 || ^4.0\",\n- \"symfony/security\": \"^3.0 || ^4.0\",\n+ \"symfony/expression-language\": \"^3.4 || ^4.0\",\n+ \"symfony/finder\": \"^3.4 || ^4.0\",\n+ \"symfony/form\": \"^3.4 || ^4.0\",\n+ \"symfony/framework-bundle\": \"^3.4 || ^4.0\",\n+ \"symfony/phpunit-bridge\": \"^3.4 || ^4.0\",\n+ \"symfony/routing\": \"^3.4 || ^4.0\",\n+ \"symfony/security\": \"^3.4 || ^4.0\",\n\"symfony/security-bundle\": \"^3.4 || ^4.0\",\n\"symfony/twig-bundle\": \"^3.4 || ^4.0\",\n- \"symfony/validator\": \"^3.3 || ^4.0\",\n- \"symfony/web-profiler-bundle\": \"^3.3 || ^4.0\",\n- \"symfony/yaml\": \"^3.3 || ^4.0\",\n- \"webonyx/graphql-php\": \">=0.12 <1.0\"\n+ \"symfony/validator\": \"^3.4 || ^4.0\",\n+ \"symfony/web-profiler-bundle\": \"^3.4 || ^4.0\",\n+ \"symfony/yaml\": \"^3.4 || ^4.0\",\n+ \"webonyx/graphql-php\": \">=0.13 <1.0\"\n},\n\"suggest\": {\n\"friendsofsymfony/user-bundle\": \"To use the FOSUserBundle bridge.\",\n\"homepage\": \"https://dunglas.fr\"\n}\n],\n- \"description\": \"The ultimate solution to create web APIs.\",\n+ \"description\": \"Build a fully-featured hypermedia or GraphQL API in minutes\",\n\"homepage\": \"https://api-platform.com\",\n\"keywords\": [\n\"Hydra\",\n\"JSON-LD\",\n\"api\",\n+ \"graphql\",\n\"hal\",\n- \"json\",\n+ \"jsonapi\",\n+ \"openapi\",\n\"rest\",\n\"swagger\"\n],\n- \"time\": \"2018-11-16T16:36:39+00:00\"\n+ \"time\": \"2018-12-24T16:23:04+00:00\"\n},\n{\n\"name\": \"behat/transliterator\",\n},\n{\n\"name\": \"league/glide\",\n- \"version\": \"1.3.0\",\n+ \"version\": \"1.4.0\",\n\"source\": {\n\"type\": \"git\",\n\"url\": \"https://github.com/thephpleague/glide.git\",\n- \"reference\": \"bd29f65c9666abd72e66916e0573801e435ca878\"\n+ \"reference\": \"72430fbdb446c754910f0bab97e1ef14baab1e80\"\n},\n\"dist\": {\n\"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/thephpleague/glide/zipball/bd29f65c9666abd72e66916e0573801e435ca878\",\n- \"reference\": \"bd29f65c9666abd72e66916e0573801e435ca878\",\n+ \"url\": \"https://api.github.com/repos/thephpleague/glide/zipball/72430fbdb446c754910f0bab97e1ef14baab1e80\",\n+ \"reference\": \"72430fbdb446c754910f0bab97e1ef14baab1e80\",\n\"shasum\": \"\"\n},\n\"require\": {\n- \"intervention/image\": \"^2.1\",\n+ \"intervention/image\": \"^2.4\",\n\"league/flysystem\": \"^1.0\",\n\"php\": \"^5.4 | ^7.0\",\n\"psr/http-message\": \"^1.0\"\n\"manipulation\",\n\"processing\"\n],\n- \"time\": \"2018-02-12T23:28:25+00:00\"\n+ \"time\": \"2018-12-22T17:56:55+00:00\"\n},\n{\n\"name\": \"league/glide-symfony\",\n},\n{\n\"name\": \"nikic/php-parser\",\n- \"version\": \"v4.1.0\",\n+ \"version\": \"v4.1.1\",\n\"source\": {\n\"type\": \"git\",\n\"url\": \"https://github.com/nikic/PHP-Parser.git\",\n- \"reference\": \"d0230c5c77a7e3cfa69446febf340978540958c0\"\n+ \"reference\": \"8aae5b59b83bb4d0dbf07b0a835f2680a658f610\"\n},\n\"dist\": {\n\"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/nikic/PHP-Parser/zipball/d0230c5c77a7e3cfa69446febf340978540958c0\",\n- \"reference\": \"d0230c5c77a7e3cfa69446febf340978540958c0\",\n+ \"url\": \"https://api.github.com/repos/nikic/PHP-Parser/zipball/8aae5b59b83bb4d0dbf07b0a835f2680a658f610\",\n+ \"reference\": \"8aae5b59b83bb4d0dbf07b0a835f2680a658f610\",\n\"shasum\": \"\"\n},\n\"require\": {\n\"parser\",\n\"php\"\n],\n- \"time\": \"2018-10-10T09:24:14+00:00\"\n+ \"time\": \"2018-12-26T11:32:39+00:00\"\n},\n{\n\"name\": \"nyholm/nsa\",\n},\n{\n\"name\": \"webmozart/assert\",\n- \"version\": \"1.3.0\",\n+ \"version\": \"1.4.0\",\n\"source\": {\n\"type\": \"git\",\n\"url\": \"https://github.com/webmozart/assert.git\",\n- \"reference\": \"0df1908962e7a3071564e857d86874dad1ef204a\"\n+ \"reference\": \"83e253c8e0be5b0257b881e1827274667c5c17a9\"\n},\n\"dist\": {\n\"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a\",\n- \"reference\": \"0df1908962e7a3071564e857d86874dad1ef204a\",\n+ \"url\": \"https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9\",\n+ \"reference\": \"83e253c8e0be5b0257b881e1827274667c5c17a9\",\n\"shasum\": \"\"\n},\n\"require\": {\n- \"php\": \"^5.3.3 || ^7.0\"\n+ \"php\": \"^5.3.3 || ^7.0\",\n+ \"symfony/polyfill-ctype\": \"^1.8\"\n},\n\"require-dev\": {\n\"phpunit/phpunit\": \"^4.6\",\n\"check\",\n\"validate\"\n],\n- \"time\": \"2018-01-29T19:49:41+00:00\"\n+ \"time\": \"2018-12-25T11:19:39+00:00\"\n},\n{\n\"name\": \"webmozart/path-util\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/ContentHelperExtension.php",
"new_path": "src/Twig/ContentHelperExtension.php",
"diff": "@@ -7,7 +7,7 @@ namespace Bolt\\Twig;\nuse Bolt\\Content\\MenuBuilder;\nuse Bolt\\Entity\\Content;\nuse Bolt\\Entity\\Field;\n-use Doctrine\\ORM\\PersistentCollection;\n+use Doctrine\\Common\\Collections\\Collection;\nuse Symfony\\Component\\Translation\\TranslatorInterface;\nuse Twig\\Extension\\AbstractExtension;\nuse Twig\\TwigFunction;\n@@ -143,7 +143,7 @@ class ContentHelperExtension extends AbstractExtension\nreturn $options;\n}\n- public function taxonomyoptions(PersistentCollection $currentCollection, $taxonomy)\n+ public function taxonomyoptions(Collection $currentCollection, $taxonomy)\n{\n$currentValues = [];\n$options = [];\n@@ -167,7 +167,7 @@ class ContentHelperExtension extends AbstractExtension\nreturn $options;\n}\n- public function taxonomyvalues(PersistentCollection $currentCollection, ?string $taxonomy = null)\n+ public function taxonomyvalues(Collection $currentCollection, ?string $taxonomy = null)\n{\n$values = [];\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/content/_taxonomies.html.twig",
"new_path": "templates/content/_taxonomies.html.twig",
"diff": "{% set value = taxonomyvalues(record.taxonomies, definition.slug) %}\n{{ definition.name }} [ {{ value }} ]\n- <editor-multiselect\n+\n+ <editor-select\n:value=\"'{{ value }}'\"\n:name=\"'taxonomy[{{ definition.slug }}]'\"\n:id=\"'taxonomy-{{ definition.slug }}'\"\n:options=\"{{ options|json_encode() }}\"\n- ></editor-multiselect>\n+ :multiple=\"false\"\n+ ></editor-select>\n+\n{#{% if definition.behaves_like == 'categories' %}#}\n{#cats#}\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/content/edit.html.twig",
"new_path": "templates/content/edit.html.twig",
"diff": "{% block topsection %}\n+ {{ dump(record.taxonomies) }}\n+\n+\n+ {{ dump(record.taxonomies|first) }}\n+ {{ dump(record.taxonomies) }}\n+\n{% endblock %}\n{% block main %}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Working on <select>
|
95,144 |
28.12.2018 20:59:36
| -3,600 |
e8e134c7c6a5a3f0d1fb1e4416f136400a9fc4db
|
Fix setting status.
|
[
{
"change_type": "MODIFY",
"old_path": "composer.lock",
"new_path": "composer.lock",
"diff": "},\n{\n\"name\": \"bolt/common\",\n- \"version\": \"v2.0.0\",\n+ \"version\": \"v2.0.1\",\n\"source\": {\n\"type\": \"git\",\n\"url\": \"https://github.com/bolt/common.git\",\n- \"reference\": \"42a7658b41795563e5f70bc89e4eb24d09e7cb37\"\n+ \"reference\": \"e2cab20e2b2e15be5f2403c937e20cd924ff810e\"\n},\n\"dist\": {\n\"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/bolt/common/zipball/42a7658b41795563e5f70bc89e4eb24d09e7cb37\",\n- \"reference\": \"42a7658b41795563e5f70bc89e4eb24d09e7cb37\",\n+ \"url\": \"https://api.github.com/repos/bolt/common/zipball/e2cab20e2b2e15be5f2403c937e20cd924ff810e\",\n+ \"reference\": \"e2cab20e2b2e15be5f2403c937e20cd924ff810e\",\n\"shasum\": \"\"\n},\n\"require\": {\n}\n],\n\"description\": \"Common utilities for all Bolt libraries\",\n- \"time\": \"2018-09-29T06:09:40+00:00\"\n+ \"time\": \"2018-12-28T19:57:32+00:00\"\n},\n{\n\"name\": \"cocur/slugify\",\n},\n{\n\"name\": \"nesbot/carbon\",\n- \"version\": \"1.36.1\",\n+ \"version\": \"1.36.2\",\n\"source\": {\n\"type\": \"git\",\n\"url\": \"https://github.com/briannesbitt/Carbon.git\",\n- \"reference\": \"63da8cdf89d7a5efe43aabc794365f6e7b7b8983\"\n+ \"reference\": \"cd324b98bc30290f233dd0e75e6ce49f7ab2a6c9\"\n},\n\"dist\": {\n\"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/briannesbitt/Carbon/zipball/63da8cdf89d7a5efe43aabc794365f6e7b7b8983\",\n- \"reference\": \"63da8cdf89d7a5efe43aabc794365f6e7b7b8983\",\n+ \"url\": \"https://api.github.com/repos/briannesbitt/Carbon/zipball/cd324b98bc30290f233dd0e75e6ce49f7ab2a6c9\",\n+ \"reference\": \"cd324b98bc30290f233dd0e75e6ce49f7ab2a6c9\",\n\"shasum\": \"\"\n},\n\"require\": {\n\"datetime\",\n\"time\"\n],\n- \"time\": \"2018-11-22T18:23:02+00:00\"\n+ \"time\": \"2018-12-28T10:07:33+00:00\"\n},\n{\n\"name\": \"nikic/php-parser\",\n},\n{\n\"name\": \"phpstan/phpstan\",\n- \"version\": \"0.10.6\",\n+ \"version\": \"0.10.7\",\n\"source\": {\n\"type\": \"git\",\n\"url\": \"https://github.com/phpstan/phpstan.git\",\n- \"reference\": \"f0252a5ab6b4a293fb25f218d9c64386f272280f\"\n+ \"reference\": \"b7a70043d9a933c9d1575df49a7b141dbc3c469f\"\n},\n\"dist\": {\n\"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/phpstan/phpstan/zipball/f0252a5ab6b4a293fb25f218d9c64386f272280f\",\n- \"reference\": \"f0252a5ab6b4a293fb25f218d9c64386f272280f\",\n+ \"url\": \"https://api.github.com/repos/phpstan/phpstan/zipball/b7a70043d9a933c9d1575df49a7b141dbc3c469f\",\n+ \"reference\": \"b7a70043d9a933c9d1575df49a7b141dbc3c469f\",\n\"shasum\": \"\"\n},\n\"require\": {\n\"MIT\"\n],\n\"description\": \"PHPStan - PHP Static Analysis Tool\",\n- \"time\": \"2018-12-04T07:28:04+00:00\"\n+ \"time\": \"2018-12-28T13:47:37+00:00\"\n},\n{\n\"name\": \"slam/php-cs-fixer-extensions\",\n},\n{\n\"name\": \"symplify/better-phpdoc-parser\",\n- \"version\": \"v5.2.18\",\n+ \"version\": \"v5.2.22\",\n\"source\": {\n\"type\": \"git\",\n\"url\": \"https://github.com/Symplify/BetterPhpDocParser.git\",\n- \"reference\": \"7a1e3b44a2fafa0b3dadd633c7b4a0f2b92f3fa4\"\n+ \"reference\": \"aa7da0d210147aae0a13d12fc33b3d55b0e274df\"\n},\n\"dist\": {\n\"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/Symplify/BetterPhpDocParser/zipball/7a1e3b44a2fafa0b3dadd633c7b4a0f2b92f3fa4\",\n- \"reference\": \"7a1e3b44a2fafa0b3dadd633c7b4a0f2b92f3fa4\",\n+ \"url\": \"https://api.github.com/repos/Symplify/BetterPhpDocParser/zipball/aa7da0d210147aae0a13d12fc33b3d55b0e274df\",\n+ \"reference\": \"aa7da0d210147aae0a13d12fc33b3d55b0e274df\",\n\"shasum\": \"\"\n},\n\"require\": {\n\"nette/utils\": \"^2.5\",\n\"php\": \"^7.1\",\n\"phpstan/phpdoc-parser\": \"^0.3\",\n- \"symplify/package-builder\": \"^5.2.18\",\n+ \"symplify/package-builder\": \"^5.2.22\",\n\"thecodingmachine/safe\": \"^0.1.8\"\n},\n\"require-dev\": {\n\"MIT\"\n],\n\"description\": \"Slim wrapper around phpstan/phpdoc-parser with format preserving printer\",\n- \"time\": \"2018-12-18T18:30:48+00:00\"\n+ \"time\": \"2018-12-28T07:40:02+00:00\"\n},\n{\n\"name\": \"symplify/coding-standard\",\n- \"version\": \"v5.2.18\",\n+ \"version\": \"v5.2.22\",\n\"source\": {\n\"type\": \"git\",\n\"url\": \"https://github.com/Symplify/CodingStandard.git\",\n- \"reference\": \"8a38b31f2d9af75de26fe583474f1fbb125c1b5a\"\n+ \"reference\": \"d8764b440743d6095e08d429b9d825c4be8e8ccf\"\n},\n\"dist\": {\n\"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/Symplify/CodingStandard/zipball/8a38b31f2d9af75de26fe583474f1fbb125c1b5a\",\n- \"reference\": \"8a38b31f2d9af75de26fe583474f1fbb125c1b5a\",\n+ \"url\": \"https://api.github.com/repos/Symplify/CodingStandard/zipball/d8764b440743d6095e08d429b9d825c4be8e8ccf\",\n+ \"reference\": \"d8764b440743d6095e08d429b9d825c4be8e8ccf\",\n\"shasum\": \"\"\n},\n\"require\": {\n\"nette/utils\": \"^2.5\",\n\"php\": \"^7.1\",\n\"slam/php-cs-fixer-extensions\": \"^1.17\",\n- \"squizlabs/php_codesniffer\": \"^3.3\",\n- \"symplify/token-runner\": \"^5.2.18\",\n+ \"squizlabs/php_codesniffer\": \"^3.4\",\n+ \"symplify/token-runner\": \"^5.2.22\",\n\"thecodingmachine/safe\": \"^0.1.8\"\n},\n\"require-dev\": {\n\"nette/application\": \"^2.4\",\n\"phpunit/phpunit\": \"^7.5\",\n- \"symplify/easy-coding-standard-tester\": \"^5.2.18\",\n- \"symplify/package-builder\": \"^5.2.18\"\n+ \"symplify/easy-coding-standard-tester\": \"^5.2.22\",\n+ \"symplify/package-builder\": \"^5.2.22\"\n},\n\"type\": \"library\",\n\"extra\": {\n\"MIT\"\n],\n\"description\": \"Set of Symplify rules for PHP_CodeSniffer and PHP CS Fixer.\",\n- \"time\": \"2018-12-18T18:30:48+00:00\"\n+ \"time\": \"2018-12-28T07:40:02+00:00\"\n},\n{\n\"name\": \"symplify/easy-coding-standard\",\n- \"version\": \"v5.2.18\",\n+ \"version\": \"v5.2.22\",\n\"source\": {\n\"type\": \"git\",\n\"url\": \"https://github.com/Symplify/EasyCodingStandard.git\",\n- \"reference\": \"f901a5c7dd5abe62b6291cc38850b89a0c62bfd9\"\n+ \"reference\": \"490e04bd44ff3a75ef33703d59d4eadf2967f929\"\n},\n\"dist\": {\n\"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/Symplify/EasyCodingStandard/zipball/f901a5c7dd5abe62b6291cc38850b89a0c62bfd9\",\n- \"reference\": \"f901a5c7dd5abe62b6291cc38850b89a0c62bfd9\",\n+ \"url\": \"https://api.github.com/repos/Symplify/EasyCodingStandard/zipball/490e04bd44ff3a75ef33703d59d4eadf2967f929\",\n+ \"reference\": \"490e04bd44ff3a75ef33703d59d4eadf2967f929\",\n\"shasum\": \"\"\n},\n\"require\": {\n\"ocramius/package-versions\": \"^1.3\",\n\"php\": \"^7.1\",\n\"slevomat/coding-standard\": \"^4.8\",\n- \"squizlabs/php_codesniffer\": \"^3.3\",\n+ \"squizlabs/php_codesniffer\": \"^3.4\",\n\"symfony/cache\": \"^3.4|^4.1\",\n\"symfony/config\": \"^3.4|^4.1\",\n\"symfony/console\": \"^3.4|^4.1\",\n\"symfony/finder\": \"^3.4|^4.1\",\n\"symfony/http-kernel\": \"^3.4|^4.1\",\n\"symfony/yaml\": \"^3.4|^4.1\",\n- \"symplify/coding-standard\": \"^5.2.18\",\n- \"symplify/package-builder\": \"^5.2.18\",\n- \"symplify/token-runner\": \"^5.2.18\",\n+ \"symplify/coding-standard\": \"^5.2.22\",\n+ \"symplify/package-builder\": \"^5.2.22\",\n+ \"symplify/token-runner\": \"^5.2.22\",\n\"thecodingmachine/safe\": \"^0.1.8\"\n},\n\"require-dev\": {\n\"phpunit/phpunit\": \"^7.5\",\n- \"symplify/easy-coding-standard-tester\": \"^5.2.18\"\n+ \"symplify/easy-coding-standard-tester\": \"^5.2.22\"\n},\n\"bin\": [\n\"bin/ecs\"\n\"MIT\"\n],\n\"description\": \"Use Coding Standard with 0-knowledge of PHP-CS-Fixer and PHP_CodeSniffer.\",\n- \"time\": \"2018-12-18T18:30:48+00:00\"\n+ \"time\": \"2018-12-28T07:40:02+00:00\"\n},\n{\n\"name\": \"symplify/package-builder\",\n- \"version\": \"v5.2.18\",\n+ \"version\": \"v5.2.22\",\n\"source\": {\n\"type\": \"git\",\n\"url\": \"https://github.com/Symplify/PackageBuilder.git\",\n- \"reference\": \"fae792579378e436d52d65c775bf9ec62b1c3ee2\"\n+ \"reference\": \"9cc0bdbbc13ea4d97faf50c6a15896b95effb790\"\n},\n\"dist\": {\n\"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/Symplify/PackageBuilder/zipball/fae792579378e436d52d65c775bf9ec62b1c3ee2\",\n- \"reference\": \"fae792579378e436d52d65c775bf9ec62b1c3ee2\",\n+ \"url\": \"https://api.github.com/repos/Symplify/PackageBuilder/zipball/9cc0bdbbc13ea4d97faf50c6a15896b95effb790\",\n+ \"reference\": \"9cc0bdbbc13ea4d97faf50c6a15896b95effb790\",\n\"shasum\": \"\"\n},\n\"require\": {\n\"MIT\"\n],\n\"description\": \"Dependency Injection, Console and Kernel toolkit for Symplify packages.\",\n- \"time\": \"2018-12-18T17:45:39+00:00\"\n+ \"time\": \"2018-12-27T19:12:50+00:00\"\n},\n{\n\"name\": \"symplify/token-runner\",\n- \"version\": \"v5.2.18\",\n+ \"version\": \"v5.2.22\",\n\"source\": {\n\"type\": \"git\",\n\"url\": \"https://github.com/Symplify/TokenRunner.git\",\n- \"reference\": \"537aa2326d52a527f5f0ae29c356b9497c27f2f5\"\n+ \"reference\": \"4257fa407d3890d95fb454695715a0dad76329b9\"\n},\n\"dist\": {\n\"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/Symplify/TokenRunner/zipball/537aa2326d52a527f5f0ae29c356b9497c27f2f5\",\n- \"reference\": \"537aa2326d52a527f5f0ae29c356b9497c27f2f5\",\n+ \"url\": \"https://api.github.com/repos/Symplify/TokenRunner/zipball/4257fa407d3890d95fb454695715a0dad76329b9\",\n+ \"reference\": \"4257fa407d3890d95fb454695715a0dad76329b9\",\n\"shasum\": \"\"\n},\n\"require\": {\n\"nette/finder\": \"^2.4\",\n\"nette/utils\": \"^2.5\",\n\"php\": \"^7.1\",\n- \"squizlabs/php_codesniffer\": \"^3.3\",\n- \"symplify/better-phpdoc-parser\": \"^5.2.18\",\n- \"symplify/package-builder\": \"^5.2.18\",\n+ \"squizlabs/php_codesniffer\": \"^3.4\",\n+ \"symplify/better-phpdoc-parser\": \"^5.2.22\",\n+ \"symplify/package-builder\": \"^5.2.22\",\n\"thecodingmachine/safe\": \"^0.1.8\"\n},\n\"require-dev\": {\n\"MIT\"\n],\n\"description\": \"Set of utils for PHP_CodeSniffer and PHP CS Fixer.\",\n- \"time\": \"2018-12-18T18:30:48+00:00\"\n+ \"time\": \"2018-12-28T07:40:02+00:00\"\n},\n{\n\"name\": \"thecodingmachine/safe\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/ContentEditController.php",
"new_path": "src/Controller/Backend/ContentEditController.php",
"diff": "@@ -4,6 +4,7 @@ declare(strict_types=1);\nnamespace Bolt\\Controller\\Backend;\n+use Bolt\\Common\\Json;\nuse Bolt\\Configuration\\Config;\nuse Bolt\\Controller\\BaseController;\nuse Bolt\\Entity\\Content;\n@@ -105,7 +106,7 @@ class ContentEditController extends BaseController\n$content->setConfig($this->config);\n}\n- $content->setStatus(current($post['status']));\n+ $content->setStatus(Json::findScalar($post['status']));\n$content->setPublishedAt(new Carbon($post['publishedAt']));\n$content->setDepublishedAt(new Carbon($post['depublishedAt']));\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Fix setting status.
|
95,144 |
30.12.2018 11:26:41
| -3,600 |
a3030abd1a570f2f4473a82450aff02e374e2100
|
Fixes error when editing records with `video` field
|
[
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/generic.html.twig",
"new_path": "templates/_partials/fields/generic.html.twig",
"diff": "{% extends '@bolt/_partials/fields/_base.html.twig' %}\n{% block field %}\n- <input name=\"{{ name }}\" placeholder=\"First Name\" type=\"text\" value=\"{{ value }}\" class=\"form-control {{ class }}\" {{ attributes|default()|raw }}>\n+ <input name=\"{{ name }}\" placeholder=\"First Name\" type=\"text\" value=\"{{ value|join(\", \") }}\" class=\"form-control {{ class }}\" {{ attributes|default()|raw }}>\n{% endblock %}\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/select.html.twig",
"new_path": "templates/_partials/fields/select.html.twig",
"diff": "{% block field %}\n<editor-select\n- :value={{ value|json_encode() }}\n+ :value=\"'{{ value|json_encode() }}'\"\n:name=\"'{{ name }}'\"\n:id=\"'{{ id }}'\"\n- :options=\"{{ options|json_encode() }}\"\n+ :options=\"'{{ options|json_encode() }}'\"\n:form=\"'{{ form }}'\"\n:multiple=\"{{ multiple }}\"\n></editor-select>\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/content/_taxonomies.html.twig",
"new_path": "templates/content/_taxonomies.html.twig",
"diff": "{{ definition.name }}\n<editor-select\n- :value={{ ['fun', 'love']|json_encode() }}\n+ :value=\"'{{ ['fun', 'love']|json_encode() }}'\"\n:name=\"'taxonomy[{{ definition.slug }}]'\"\n:id=\"'taxonomy-{{ definition.slug }}'\"\n- :options={{ options|json_encode() }}\n+ :options=\"'{{ options|json_encode() }}'\"\n:multiple=\"true\"\n></editor-select>\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Fixes error when editing records with `video` field
|
95,180 |
30.12.2018 11:52:13
| -3,600 |
8f9e206dc5f7af9431b8f9556fce51bf4d5c506c
|
added multiselect fixes
|
[
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/Editor/Select/Select.vue",
"new_path": "assets/js/app/editor/Components/Editor/Select/Select.vue",
"diff": "<template>\n<div>\n<multiselect\n- v-model=\"option\"\n+ v-model=\"selected\"\ntrack-by=\"key\"\nlabel=\"value\"\n:options=\"options\"\n:searchable=\"false\"\n:show-labels=\"false\"\n- :multiple=\"multiple\"\n:limit=\"1000\"\n- @input=\"serialiseValues\"\n+ :multiple=\"multiple\"\n>\n+\n<template slot=\"singleLabel\" slot-scope=\"props\" v-if=\"name === 'status'\">\n<span class=\"status mr-2\" :class=\"`is-${props.option.key}`\"></span>{{props.option.key}}\n</template>\n<template slot=\"option\" slot-scope=\"props\" v-if=\"name === 'status'\">\n<span class=\"status mr-2\" :class=\"`is-${props.option.key}`\"></span>{{props.option.key}}\n</template>\n+\n</multiselect>\n- (Hidden input:\n<input\ntype=\"text\"\n:id=\"id\"\n:name=\"fieldName\"\n:form=\"form\"\n- :value=\"serialised\"\n- > )\n+ :value=\"sanitized\"\n+ >\n</div>\n</template>\n@@ -37,63 +37,35 @@ export default {\nname: \"editor-select\",\nprops: ['value', 'name', 'id', 'form', 'options', 'multiple'],\ncomponents: { Multiselect },\n-\nmounted(){\n- let key = this.value;\n- let value = '';\n+ const _values = this.value;\n+ const _options = this.options;\n- console.log('options:', this.options);\n- console.log('value:', this.value);\n- console.log('key:', key);\n-\n- this.options.forEach(function(item) {\n- if (item.selected == true) {\n- value = item.value;\n- console.log('selected: ', item.key);\n- }\n- });\n-\n- value = this.options;\n-\n- // This is still whack\n- this.option.key = this.value;\n- this.serialised = JSON.stringify(key);\n+ let filterSelectedItems = _options.filter(item => {\n+ return _values.includes(item.key);\n+ })\n+ this.selected = filterSelectedItems;\n},\n-\ndata: () => {\nreturn {\n- option: {\n- key: null,\n- selected: true,\n- value: null\n- },\n- serialised: ''\n+ selected: [],\n}\n},\n-\ncomputed: {\n+ sanitized(){\n+ let filtered;\n+ if(this.multiple){\n+ filtered = this.selected.map(item => item.key);\n+ return JSON.stringify(filtered);\n+ } else {\n+ filtered = [this.selected];\n+ return JSON.stringify(filtered[0].key);\n+ }\n+ },\nfieldName() {\nreturn this.name + '[]'\n},\n- },\n-\n- methods: {\n- serialiseValues(value) {\n- var selected = [];\n-\n- if (value.key) {\n- // Single\n- selected.push(value.key);\n- } else {\n- // Multiple\n- value.forEach(function(item) {\n- selected.push(item.key);\n- });\n- }\n-\n- this.serialised = JSON.stringify(selected);\n- }\n}\n};\n</script>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "config/bolt/contenttypes.yaml",
"new_path": "config/bolt/contenttypes.yaml",
"diff": "@@ -319,6 +319,28 @@ blocks:\nicon_many: \"fa:cubes\"\nicon_one: \"fa:cube\"\n+\n+dummies:\n+ name: Dummies\n+ singular_name: Dummy\n+ fields:\n+ title:\n+ type: text\n+ class: large\n+ group: content\n+ slug:\n+ type: slug\n+ uses: title\n+ selectfield:\n+ type: select\n+ values: [ foo, bar, baz ]\n+ multiselect:\n+ type: select\n+ values: [ A-tuin, Donatello, Rafael, Leonardo, Michelangelo, Koopa, Squirtle ]\n+ multiple: true\n+ postfix: \"Select your favourite turtle(s).\"\n+ taxonomy: [ groups, categories, tags, foobars ]\n+\n# Possible field types:\n#\n# text - varchar(256) - input type text.\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/select.html.twig",
"new_path": "templates/_partials/fields/select.html.twig",
"diff": ":value=\"'{{ value|json_encode() }}'\"\n:name=\"'{{ name }}'\"\n:id=\"'{{ id }}'\"\n- :options=\"'{{ options|json_encode() }}'\"\n+ :options=\"{{ options|json_encode() }}\"\n:form=\"'{{ form }}'\"\n:multiple=\"{{ multiple }}\"\n></editor-select>\n-\n- (Current saved value: <code>{{ value|json_encode() }}</code> )\n{% endblock %}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
added multiselect fixes
|
95,144 |
30.12.2018 12:12:39
| -3,600 |
983aae3e2897734e98c6f81c5f1de89898e99f01
|
Treat all selects the same.
|
[
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/Editor/Select/Select.vue",
"new_path": "assets/js/app/editor/Components/Editor/Select/Select.vue",
"diff": "@@ -55,13 +55,8 @@ export default {\ncomputed: {\nsanitized(){\nlet filtered;\n- if(this.multiple){\nfiltered = this.selected.map(item => item.key);\nreturn JSON.stringify(filtered);\n- } else {\n- filtered = [this.selected];\n- return JSON.stringify(filtered[0].key);\n- }\n},\nfieldName() {\nreturn this.name + '[]'\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Treat all selects the same.
|
95,144 |
31.12.2018 11:17:32
| -3,600 |
afb93abc65a6b2cbfa7a69cd2e94849a34f381c8
|
Working more on Taxonomies
|
[
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/Editor/Select/Select.vue",
"new_path": "assets/js/app/editor/Components/Editor/Select/Select.vue",
"diff": "track-by=\"key\"\nlabel=\"value\"\n:options=\"options\"\n- :searchable=\"false\"\n:show-labels=\"false\"\n:limit=\"1000\"\n:multiple=\"multiple\"\n+ :taggable=\"taggable\"\n+ :searchable=\"taggable\"\n+ tag-placeholder=\"Add this as new tag\"\n+ tag-position=\"bottom\"\n+ @tag=\"addTag\"\n>\n-\n<template slot=\"singleLabel\" slot-scope=\"props\" v-if=\"name === 'status'\">\n<span class=\"status mr-2\" :class=\"`is-${props.option.key}`\"></span>{{props.option.key}}\n</template>\n<template slot=\"option\" slot-scope=\"props\" v-if=\"name === 'status'\">\n<span class=\"status mr-2\" :class=\"`is-${props.option.key}`\"></span>{{props.option.key}}\n</template>\n-\n</multiselect>\n-\n<input\ntype=\"text\"\n:id=\"id\"\n@@ -35,7 +36,7 @@ import Multiselect from 'vue-multiselect'\nexport default {\nname: \"editor-select\",\n- props: ['value', 'name', 'id', 'form', 'options', 'multiple'],\n+ props: ['value', 'name', 'id', 'form', 'options', 'multiple', 'taggable'],\ncomponents: { Multiselect },\nmounted(){\nconst _values = this.value;\n@@ -61,6 +62,18 @@ export default {\nfieldName() {\nreturn this.name + '[]'\n},\n+ },\n+ methods: {\n+ addTag (newTag) {\n+ const tag = {\n+ key: newTag,\n+ value: newTag,\n+ selected: true\n+ };\n+ this.options.push(tag);\n+ this.value.push(tag);\n+ this.selected.push(tag);\n+ }\n}\n};\n</script>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "config/bolt/contenttypes.yaml",
"new_path": "config/bolt/contenttypes.yaml",
"diff": "@@ -334,11 +334,11 @@ dummies:\nselectfield:\ntype: select\nvalues: [ foo, bar, baz ]\n- multiselect:\n- type: select\n- values: [ A-tuin, Donatello, Rafael, Leonardo, Michelangelo, Koopa, Squirtle ]\n- multiple: true\n- postfix: \"Select your favourite turtle(s).\"\n+# multiselect:\n+# type: select\n+# values: [ A-tuin, Donatello, Rafael, Leonardo, Michelangelo, Koopa, Squirtle ]\n+# multiple: true\n+# postfix: \"Select your favourite turtle(s).\"\ntaxonomy: [ groups, categories, tags, foobars ]\n# Possible field types:\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/ContentEditController.php",
"new_path": "src/Controller/Backend/ContentEditController.php",
"diff": "@@ -150,15 +150,13 @@ class ContentEditController extends BaseController\n{\n$taxonomy = collect(Json::findArray($taxonomy))->filter();\n- dump($taxonomy);\n-\n// Remove old ones\n- foreach ($content->getTaxonomies() as $current) {\n+ foreach ($content->getTaxonomies($key) as $current) {\n$content->removeTaxonomy($current);\n}\n+ // Then (re-) add selected ones\nforeach ($taxonomy as $slug) {\n- dump($slug);\n$taxonomy = $this->taxonomyRepository->findOneBy([\n'type' => $key,\n'slug' => $slug,\n@@ -170,9 +168,6 @@ class ContentEditController extends BaseController\n$content->addTaxonomy($taxonomy);\n}\n-\n-\n-\n}\nprivate function getEditLocale(Request $request, Content $content): string\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Entity/Content.php",
"new_path": "src/Entity/Content.php",
"diff": "@@ -358,8 +358,16 @@ class Content\n/**\n* @return Collection|Taxonomy[]\n*/\n- public function getTaxonomies(): Collection\n+ public function getTaxonomies(?string $type = null): Collection\n{\n+ if (! empty($type)) {\n+ return $this->taxonomies->filter(\n+ function ($taxo) use ($type) {\n+ return $taxo->getType() === $type;\n+ }\n+ );\n+ }\n+\nreturn $this->taxonomies;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/select.html.twig",
"new_path": "templates/_partials/fields/select.html.twig",
"diff": "{% endif %}\n{% block field %}\n+ {#<pre><code>{{ options|json_encode() }}</code></pre>#}\n<editor-select\n:value=\"'{{ value|json_encode() }}'\"\n:name=\"'{{ name }}'\"\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/content/_taxonomies.html.twig",
"new_path": "templates/content/_taxonomies.html.twig",
"diff": "{% if definition %}\n{% set options = taxonomyoptions(record.taxonomies, definition) %}\n-\n{% set value = taxonomyvalues(record.taxonomies, definition.slug) %}\n- {{ definition.name }}\n+ {% if definition.behaves_like == 'grouping' %}\n+ {% set multiple = 'false' %}\n+ {% set taggable = 'false' %}\n+ {% elseif definition.behaves_like == 'categories' %}\n+ {% set multiple = definition.multiple ? 'true' : 'false' %}\n+ {% set taggable = 'false' %}\n+ {% else %} {# so, 'tags' #}\n+ {% set multiple = 'true' %}\n+ {% set taggable = 'true' %}\n+ {% endif %}\n+\n+ <div class=\"form-group editor--group is-normal\">\n+ <label for=\"field-title\">\n+ {{ definition.name }}:\n+ </label>\n+ <div>\n+ {#<pre><code>{{ value|json_encode() }}</code></pre>#}\n<editor-select\n- :value=\"'{{ ['fun', 'love']|json_encode() }}'\"\n+ :value=\"{{ value|json_encode() }}\"\n:name=\"'taxonomy[{{ definition.slug }}]'\"\n:id=\"'taxonomy-{{ definition.slug }}'\"\n- :options=\"'{{ options|json_encode() }}'\"\n- :multiple=\"true\"\n+ :options=\"{{ options|json_encode() }}\"\n+ :multiple=\"{{ multiple }}\"\n+ :taggable=\"{{ taggable }}\"\n></editor-select>\n- (Current saved value: <code>{{ value|json_encode() }}</code> )\n+ {#(Current saved value: <code>{{ value|json_encode() }}</code> )#}\n+ </div>\n- {#{% if definition.behaves_like == 'categories' %}#}\n- {#cats#}\n- {#{% endif %}#}\n+ </div>\n{% endif %}\n{% endfor %}\n- {#{% for group in groups %}#}\n- {#<div class=\"tab-pane {% if loop.first %}show active{% endif %}\" id=\"{{group|slug}}\" role=\"tabpanel\" aria-labelledby=\"{{group|slug}}-tab\">#}\n- {#{% for key, fielddefinition in record.definition.fields if fielddefinition.group == group %}#}\n-\n- {#{% set type = fielddefinition.type %}#}\n- {#{% set field = record.localisedfield(key, currentlocale, false, fielddefinition) %}#}\n-\n- {#{% include[#}\n- {#'_partials/fields/' ~ type ~ '.html.twig',#}\n- {#'_partials/fields/generic.html.twig'#}\n- {#] with {#}\n- {#'field' : field,#}\n- {#'define' : fielddefinition#}\n- {#} %}#}\n-\n- {#{% endfor %}#}\n- {#</div>#}\n- {#{% endfor %}#}\n</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/content/edit.html.twig",
"new_path": "templates/content/edit.html.twig",
"diff": "{% block topsection %}\n- {{ dump(record.selectfield) }}\n- {{ dump(record.multiselect) }}\n- {#{{ dump(record.taxonomies) }}#}\n+ {% for taxonomy in record.definition.taxonomy %}\n+ {% set definition = config.get('taxonomies/' ~ taxonomy) %}\n+ {{ dump(definition) }}\n+ {% endfor %}\n- {#{{ dump(record.taxonomies|first) }}#}\n- {#{{ dump(record.taxonomies) }}#}\n{% endblock %}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Working more on Taxonomies
|
95,144 |
01.01.2019 16:34:52
| -3,600 |
8d5d7593208993b3cf3415d211a9b50228f7a6c1
|
Show default tags
|
[
{
"change_type": "MODIFY",
"old_path": "src/Twig/ContentHelperExtension.php",
"new_path": "src/Twig/ContentHelperExtension.php",
"diff": "@@ -7,6 +7,7 @@ namespace Bolt\\Twig;\nuse Bolt\\Content\\MenuBuilder;\nuse Bolt\\Entity\\Content;\nuse Bolt\\Entity\\Field;\n+use Bolt\\Repository\\TaxonomyRepository;\nuse Doctrine\\Common\\Collections\\Collection;\nuse Symfony\\Component\\Translation\\TranslatorInterface;\nuse Twig\\Extension\\AbstractExtension;\n@@ -23,13 +24,17 @@ class ContentHelperExtension extends AbstractExtension\n/** @var string */\nprivate $menu = null;\n+ /** @var TaxonomyRepository */\n+ private $taxonomyRepository;\n+\n/**\n* ContentHelperExtension constructor.\n*/\n- public function __construct(MenuBuilder $menuBuilder, TranslatorInterface $translator)\n+ public function __construct(MenuBuilder $menuBuilder, TranslatorInterface $translator, TaxonomyRepository $taxonomyRepository)\n{\n$this->menuBuilder = $menuBuilder;\n$this->translator = $translator;\n+ $this->taxonomyRepository = $taxonomyRepository;\n}\n/**\n@@ -141,6 +146,13 @@ class ContentHelperExtension extends AbstractExtension\n{\n$options = [];\n+ if ($taxonomy['behaves_like'] === 'tags') {\n+ $allTaxonomies = $this->taxonomyRepository->findBy(['type' => $taxonomy['slug']]);\n+ foreach ($allTaxonomies as $item) {\n+ $taxonomy['options'][$item->getSlug()] = $item->getName();\n+ }\n+ }\n+\nforeach ($taxonomy['options'] as $key => $value) {\n$options[] = [\n'key' => $key,\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Show default tags
|
95,112 |
02.01.2019 15:13:01
| -3,600 |
7ef1add87582228dd0c6a4e8a44e939c816b85c2
|
improve docker config
|
[
{
"change_type": "MODIFY",
"old_path": ".env.dist",
"new_path": ".env.dist",
"diff": "@@ -16,8 +16,11 @@ APP_SECRET=67d829bf61dc5f87a73fd814e2c9f629\n# SQLite\nDATABASE_URL=sqlite:///%kernel.project_dir%/var/data/bolt.sqlite\n-# MySQL\n-# DATABASE_URL=mysql://root:\"password\"@127.0.0.1:3306/bolt_skeleton\n+# MySQL (with docker)\n+#DATABASE_USER=bolt_db_user\n+#DATABASE_PASSWORD=bolt_db_password\n+#DATABASE_NAME=bolt\n+#DATABASE_URL=mysql://bolt_db_user:bolt_db_password@mysql:3306/bolt\n###< doctrine/doctrine-bundle ###\n"
},
{
"change_type": "MODIFY",
"old_path": ".gitignore",
"new_path": ".gitignore",
"diff": "@@ -2,8 +2,10 @@ composer.phar\n### Built Assets and uploads ###\n/public/assets/\n-/public/files/\n-\n+/public/files/*\n+!/public/files/hal.jpg\n+!/public/files/kitten.jpg\n+!/public/files/vlinders.jpg\n### NPM and frontend assets building cruft\nassets/vendor/\n@@ -20,27 +22,27 @@ Vagrantfile\n.*.swp\n.swp\n*.lock\n+!composer.lock\n+!symfony.lock\n.buildpath\n.idea\n.vscode/*\n-/var/*\n-!/var/cache\n/var/cache/*\n-!var/cache/.gitkeep\n-!/var/data\n-!/var/log\n+!/var/cache/.gitkeep\n/var/log/*\n-!var/log/.gitkeep\n-!/var/sessions\n+!/var/log/.gitkeep\n+/var/data/*\n+!/var/data/.gitkeep\n/var/sessions/*\n-!var/sessions/.gitkeep\n-!var/SymfonyRequirements.php\n+!/var/sessions/.gitkeep\n+\n+###Local config\n+/config/packages/local\n###> symfony/framework-bundle ###\n/.env\n/public/bundles/\n-/var/\n/vendor/\n###< symfony/framework-bundle ###\n@@ -58,8 +60,6 @@ Vagrantfile\n/.php_cs.cache\n###< friendsofphp/php-cs-fixer ###\n-\n-\n###> squizlabs/php_codesniffer ###\n/.phpcs-cache\n/phpcs.xml\n"
},
{
"change_type": "DELETE",
"old_path": ".php_cs",
"new_path": null,
"diff": "-<?php\n-\n-$finder = PhpCsFixer\\Finder::create()\n- ->in(__DIR__)\n- ->exclude('config')\n- ->exclude('var')\n- ->exclude('public/bundles')\n- ->exclude('public/build')\n- // exclude files generated by Symfony Flex recipes\n- ->notPath('bin/console')\n- ->notPath('public/index.php')\n-;\n-\n-return PhpCsFixer\\Config::create()\n- ->setRiskyAllowed(true)\n- ->setRules([\n- '@Symfony' => true,\n- '@PSR2' => true,\n- '@Symfony:risky' => true,\n- 'array_syntax' => ['syntax' => 'short'],\n- 'linebreak_after_opening_tag' => true,\n- 'mb_str_functions' => true,\n- 'no_php4_constructor' => true,\n- 'no_superfluous_phpdoc_tags' => false,\n- 'no_unreachable_default_argument_value' => true,\n- 'no_useless_else' => true,\n- 'no_useless_return' => true,\n- 'ordered_imports' => true,\n- 'php_unit_strict' => true,\n- 'phpdoc_order' => true,\n- 'semicolon_after_instruction' => true,\n- 'strict_comparison' => true,\n- 'strict_param' => true,\n- 'yoda_style' => false,\n- 'concat_space' => ['spacing' => 'one' ],\n- 'native_function_invocation' => false,\n- 'declare_strict_types' => true,\n- ])\n- ->setFinder($finder)\n- ->setCacheFile(__DIR__.'/var/.php_cs.cache')\n-;\n"
},
{
"change_type": "MODIFY",
"old_path": ".travis.yml",
"new_path": ".travis.yml",
"diff": "@@ -15,6 +15,7 @@ matrix:\ninclude:\n- php: 7.1.18\n- php: 7.2\n+ - php: 7.3\n- php: nightly\nallow_failures:\n- php: nightly\n"
},
{
"change_type": "MODIFY",
"old_path": "Makefile",
"new_path": "Makefile",
"diff": "@@ -39,7 +39,7 @@ db-reset:\nbin/console doctrine:schema:create\nbin/console doctrine:fixtures:load -n\n-# Dockerized commands\n+# Dockerized commands:\ndocker-install:\ndocker-compose exec -T php sh -c \"composer install\"\ndocker-compose run node sh -c \"npm install\"\n@@ -76,3 +76,6 @@ docker-db-reset:\ndocker-compose exec -T php sh -c \"bin/console doctrine:schema:drop --force\"\ndocker-compose exec -T php sh -c \"bin/console doctrine:schema:create\"\ndocker-compose exec -T php sh -c \"bin/console doctrine:fixtures:load -n\"\n+\n+docker-npm-fix-env:\n+ docker-compose run node sh -c \"npm rebuild node-sass\"\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "config/packages/dev/doctrine.yaml",
"diff": "+doctrine:\n+ # for SQLite\n+ dbal:\n+ driver: 'pdo_sqlite'\n+ server_version: '3.15'\n+ charset: utf8mb4\n+ url: '%env(resolve:DATABASE_URL)%'\n+ # for MySQL (with Docker)\n+# dbal:\n+# driver: 'pdo_mysql'\n+# charset: utf8mb4\n+# url: 'mysql://%env(DATABASE_USER)%:%env(DATABASE_PASSWORD)%@%env(DATABASE_HOST)%:3306/%env(DATABASE_NAME)%'\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "config/packages/doctrine.yaml",
"new_path": "config/packages/doctrine.yaml",
"diff": "@@ -2,15 +2,10 @@ parameters:\n# Adds a fallback DATABASE_URL if the env var is not set. This allows you\n# to run cache:warmup even if your environment variables are not available\n# yet. You should not need to change this value.\n+ env(DATABASE_DRIVER): 'pdo_sqlite'\nenv(DATABASE_URL): ''\ndoctrine:\n- dbal:\n- driver: 'pdo_sqlite'\n- server_version: '3.15'\n- charset: utf8mb4\n- url: '%env(resolve:DATABASE_URL)%'\n-\norm:\nauto_generate_proxy_classes: '%kernel.debug%'\nnaming_strategy: doctrine.orm.naming_strategy.underscore\n"
},
{
"change_type": "MODIFY",
"old_path": "config/packages/prod/doctrine.yaml",
"new_path": "config/packages/prod/doctrine.yaml",
"diff": "doctrine:\n+ dbal:\n+ driver: 'pdo_mysql'\n+ charset: utf8mb4\n+ url: '%env(DATABASE_URL)%'\n+\norm:\nmetadata_cache_driver:\ntype: service\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "config/packages/test/doctrine.yaml",
"diff": "+doctrine:\n+ dbal:\n+ driver: 'pdo_sqlite'\n+ server_version: '3.15'\n+ charset: utf8mb4\n+ url: '%env(resolve:DATABASE_URL)%'\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "docker-compose.yml",
"new_path": "docker-compose.yml",
"diff": "@@ -2,38 +2,31 @@ version: '3.4'\nservices:\nphp:\nbuild:\n- context: ./docker/php\n+ context: docker/php\ndockerfile: Dockerfile\ncache_from:\n- - php:7.3-rc-fpm\n-# env_file:\n-# - .env\n-# depends_on:\n-# - database\n-# - redis\n+ - php:7.3-fpm\n+ env_file:\n+ - .env\n+ depends_on:\n+ - database\n+ - maildev\nvolumes:\n- ./:/var/www/bolt\nworking_dir: /var/www/bolt\n-# database:\n-# image: mariadb:10\n-# env_file:\n-# - .env\n-# ports:\n-# - 33306:3306\n-# environment:\n-# MYSQL_ROOT_PASSWORD: ${DB_PASSWORD}\n-# MYSQL_PASSWORD: ${DB_PASSWORD}\n-# MYSQL_USER: ${DB_USER}\n-# MYSQL_DATABASE: ${DB_NAME}\n-# MYSQL_INITDB_SKIP_TZINFO: 0\n-\n-# redis:\n-# image: redis:4-alpine\n-# env_file:\n-# - .env\n-# ports:\n-# - 6379\n+ database:\n+ image: mariadb:10\n+ env_file:\n+ - .env\n+ ports:\n+ - 3306\n+ environment:\n+ MYSQL_ROOT_PASSWORD: ${DATABASE_PASSWORD}\n+ MYSQL_PASSWORD: ${DATABASE_PASSWORD}\n+ MYSQL_USER: ${DATABASE_USER}\n+ MYSQL_DATABASE: ${DATABASE_NAME}\n+ MYSQL_INITDB_SKIP_TZINFO: 0\nweb:\nimage: nginx:alpine\n@@ -41,18 +34,22 @@ services:\n- 8088:80\ndepends_on:\n- php\n-# env_file:\n-# - .env\nvolumes:\n- ./docker/nginx:/etc/nginx/conf.d\n- ./:/var/www/bolt\n- - ./var/logs:/var/log/nginx\n+ - ./var/log:/var/log/nginx\nentrypoint:\n- sh\n- /etc/nginx/conf.d/entrypoint.sh\nnode:\nimage: node:latest\n- working_dir: /home/node/app\nvolumes:\n- ./:/home/node/app\n+ working_dir: /home/node/app\n+\n+ maildev:\n+ image: djfarrelly/maildev\n+ container_name: sf4_maildev\n+ ports:\n+ - 8089:80\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/php/Dockerfile",
"new_path": "docker/php/Dockerfile",
"diff": "-# https://github.com/docker-library/php/blob/master/7.1/stretch/fpm/Dockerfile\n-# https://hub.docker.com/r/jarjak/php-najk/\n-FROM php:7.3-rc-fpm\n+# https://github.com/docker-library/php/blob/master/7.3/stretch/fpm/Dockerfile\n+FROM php:7.3-fpm\nENV PATH /path/to/bin/folder:$PATH\nENV PHP_MEMORYLIMIT 2048M\n@@ -31,6 +30,7 @@ RUN extBuildDeps=\" \\\nbash \\\nxvfb \\\nwget \\\n+ unzip \\\nacl \\\niproute2 \\\nttf-freefont \\\n"
},
{
"change_type": "MODIFY",
"old_path": "package-lock.json",
"new_path": "package-lock.json",
"diff": "},\n\"clean-webpack-plugin\": {\n\"version\": \"0.1.19\",\n- \"resolved\": \"https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-0.1.19.tgz\",\n+ \"resolved\": \"http://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-0.1.19.tgz\",\n\"integrity\": \"sha512-M1Li5yLHECcN2MahoreuODul5LkjohJGFxLPTjl3j1ttKrF5rgjZET1SJduuqxLAuT1gAPOdkhg03qcaaU1KeA==\",\n\"dev\": true,\n\"requires\": {\n},\n\"colors\": {\n\"version\": \"1.1.2\",\n- \"resolved\": \"https://registry.npmjs.org/colors/-/colors-1.1.2.tgz\",\n+ \"resolved\": \"http://registry.npmjs.org/colors/-/colors-1.1.2.tgz\",\n\"integrity\": \"sha1-FopHAXVran9RoSzgyXv6KMCE7WM=\",\n\"dev\": true\n},\n},\n\"globby\": {\n\"version\": \"6.1.0\",\n- \"resolved\": \"https://registry.npmjs.org/globby/-/globby-6.1.0.tgz\",\n+ \"resolved\": \"http://registry.npmjs.org/globby/-/globby-6.1.0.tgz\",\n\"integrity\": \"sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=\",\n\"dev\": true,\n\"requires\": {\n},\n\"handle-thing\": {\n\"version\": \"1.2.5\",\n- \"resolved\": \"https://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz\",\n+ \"resolved\": \"http://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz\",\n\"integrity\": \"sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ=\",\n\"dev\": true\n},\n},\n\"safe-regex\": {\n\"version\": \"1.1.0\",\n- \"resolved\": \"http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz\",\n\"integrity\": \"sha1-QKNmnzsHfR6UPURinhV91IAjvy4=\",\n\"dev\": true,\n\"requires\": {\n},\n\"strip-eof\": {\n\"version\": \"1.0.0\",\n- \"resolved\": \"http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz\",\n\"integrity\": \"sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=\",\n\"dev\": true\n},\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
improve docker config
|
95,144 |
02.01.2019 16:51:08
| -3,600 |
4c73d6606e5a759b902bb3d1b25bdf9441c77993
|
Fixing empty titles on overview
|
[
{
"change_type": "MODIFY",
"old_path": "assets/js/app/listing/Components/Table/Row/index.vue",
"new_path": "assets/js/app/listing/Components/Table/Row/index.vue",
"diff": "<!-- column details -->\n<div\nclass=\"listing__row--item is-details\"\n- v-html=\"record.excerpt\"\n>\n+ <a :href=\"record.editlink\">{{ record.title }}</a>\n+ <span>{{ record.excerpt }}</span>\n</div>\n<!-- end column -->\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/scss/modules/listing/row/row.scss",
"new_path": "assets/scss/modules/listing/row/row.scss",
"diff": "@@ -67,6 +67,18 @@ $checkbox-row-width: 30px;\n}\n&.is-details{\nflex-grow: 2;\n+ overflow: hidden;\n+ text-overflow: ellipsis;\n+ display: -webkit-box;\n+ -webkit-box-orient: vertical;\n+ -webkit-line-clamp: 3;\n+ line-height: 1.3rem;\n+ max-height: 4.5rem;\n+\n+ a {\n+ font-weight: bold;\n+ }\n+\nspan{\ncolor: var(--shade);\nfont-style: italic;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Content/MenuBuilder.php",
"new_path": "src/Content/MenuBuilder.php",
"diff": "@@ -28,9 +28,8 @@ class MenuBuilder\n/** @var UrlGeneratorInterface */\nprivate $urlGenerator;\n- /**\n- * @var TranslatorInterface\n- */\n+\n+ /** @var TranslatorInterface */\nprivate $translator;\n/**\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Entity/Content.php",
"new_path": "src/Entity/Content.php",
"diff": "@@ -108,9 +108,7 @@ class Content\n*/\nprivate $fields;\n- /**\n- * @var ContentType\n- */\n+ /** @var ContentType */\nprivate $contentTypeDefinition;\n/** @var UrlGeneratorInterface */\n@@ -150,6 +148,9 @@ class Content\nreturn $this->id;\n}\n+ /**\n+ * @see: Bolt\\EventListener\\ContentListener\n+ */\npublic function setConfig(Config $config): void\n{\n$this->config = $config;\n@@ -188,7 +189,7 @@ class Content\n'contenttype' => $this->getDefinition()->get('slug'),\n'slug' => $this->getSlug(),\n'title' => $this->magicTitle(),\n- 'excerpt' => $this->magicexcerpt(),\n+ 'excerpt' => $this->magicexcerpt(200, false),\n'image' => $this->magicImage(),\n'link' => $this->magicLink(),\n'editlink' => $this->magicEditLink(),\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Entity/ContentMagicTraits.php",
"new_path": "src/Entity/ContentMagicTraits.php",
"diff": "@@ -112,13 +112,19 @@ trait ContentMagicTraits\npublic function magicTitle(): string\n{\n- $title = [];\n+ $titleParts = [];\nforeach ($this->magicTitleFields() as $field) {\n- $title[] = $this->get($field);\n+ $titleParts[] = $this->get($field);\n}\n- return implode(' ', $title);\n+ $title = trim(implode(' ', $titleParts));\n+\n+ if (empty($title)) {\n+ return '(untitled)';\n+ }\n+\n+ return $title;\n}\npublic function magicImage(): array\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Helpers/Excerpt.php",
"new_path": "src/Helpers/Excerpt.php",
"diff": "@@ -40,10 +40,10 @@ class Excerpt\n}\nif ($this->content instanceof Content) {\n- $skip_fields = $includeTitle ? $this->content->magicTitleFields() : [];\n+ $skipFields = $this->content->magicTitleFields();\nforeach ($this->content->getFields() as $field) {\n- if (! in_array($field->getName(), $skip_fields, true) && $field->isExcerptable()) {\n+ if (! in_array($field->getName(), $skipFields, true) && $field->isExcerptable()) {\n$excerpt .= (string) $field;\n}\n}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Fixing empty titles on overview
|
95,144 |
04.01.2019 15:27:41
| -3,600 |
dacc297127a4b0b9af715594f190ed9594f547a5
|
Putting `composer update` on a diet
|
[
{
"change_type": "MODIFY",
"old_path": "composer.json",
"new_path": "composer.json",
"diff": "\"require\": {\n\"php\": \"^7.1.3\",\n\"ext-json\": \"*\",\n- \"api-platform/api-pack\": \"^1.1\",\n+ \"api-platform/core\": \"^2.1\",\n\"bolt/common\": \"^2.0\",\n\"cocur/slugify\": \"^3.1\",\n- \"doctrine/common\": \"^2.8\",\n+ \"doctrine/annotations\": \"^1.0\",\n+ \"doctrine/doctrine-bundle\": \"^1.6.10\",\n+ \"doctrine/doctrine-migrations-bundle\": \"^1.3\",\n+ \"doctrine/orm\": \"^2.5.11\",\n+ \"easycorp/easy-log-handler\": \"^1.0.7\",\n\"erusev/parsedown\": \"^1.7\",\n\"ezyang/htmlpurifier\": \"^4.10\",\n\"fzaninotto/faker\": \"^1.8\",\n\"knplabs/knp-menu-bundle\": \"^2.0\",\n\"league/glide-symfony\": \"^1.0\",\n\"miljar/php-exif\": \"^0.6.4\",\n+ \"nelmio/cors-bundle\": \"^1.5\",\n\"nesbot/carbon\": \"^1.34\",\n\"php-translation/symfony-bundle\": \"^0.8.1\",\n+ \"phpdocumentor/reflection-docblock\": \"^3.0 || ^4.0\",\n\"sensio/framework-extra-bundle\": \"^5.1\",\n\"sensiolabs/security-checker\": \"^5.0\",\n\"siriusphp/upload\": \"^2.1\",\n\"stof/doctrine-extensions-bundle\": \"^1.3\",\n- \"symfony/asset\": \"^4.2\",\n+ \"symfony/asset\": \"^3.0 || ^4.0\",\n\"symfony/console\": \"^4.2\",\n- \"symfony/debug-pack\": \"^1.0\",\n+ \"symfony/debug-bundle\": \"^4.2\",\n+ \"symfony/expression-language\": \"^3.0 || ^4.0\",\n\"symfony/flex\": \"^1.1\",\n\"symfony/form\": \"^4.2\",\n\"symfony/framework-bundle\": \"^4.2\",\n- \"symfony/orm-pack\": \"^1.0\",\n+ \"symfony/monolog-bundle\": \"^3.0\",\n\"symfony/polyfill-php72\": \"^1.8\",\n+ \"symfony/security-bundle\": \"^3.0 || ^4.0\",\n\"symfony/serializer\": \"^4.2\",\n+ \"symfony/stopwatch\": \"^4.2\",\n\"symfony/swiftmailer-bundle\": \"^3.1\",\n\"symfony/translation\": \"^4.2\",\n+ \"symfony/twig-bundle\": \"^4.2\",\n+ \"symfony/validator\": \"^3.0 || ^4.0\",\n+ \"symfony/var-dumper\": \"^4.2\",\n+ \"symfony/web-profiler-bundle\": \"^4.2\",\n\"symfony/webpack-encore-bundle\": \"^1.0\",\n\"symfony/yaml\": \"^4.2\",\n\"tightenco/collect\": \"^5.7\",\n\"phpstan/phpstan\": \"^0.10.3\",\n\"symfony/browser-kit\": \"^4.2\",\n\"symfony/css-selector\": \"^4.2\",\n- \"symfony/debug-bundle\": \"^4.2\",\n\"symfony/dotenv\": \"^4.2\",\n\"symfony/maker-bundle\": \"^1.11\",\n\"symfony/phpunit-bridge\": \"^4.2\",\n- \"symfony/stopwatch\": \"^4.2\",\n- \"symfony/web-profiler-bundle\": \"^4.2\",\n\"symfony/web-server-bundle\": \"^4.2\",\n\"symplify/easy-coding-standard\": \"^5.2\"\n},\n- \"minimum-stability\": \"dev\",\n+ \"minimum-stability\": \"stable\",\n\"prefer-stable\": true,\n\"config\": {\n\"platform\": {\n"
},
{
"change_type": "MODIFY",
"old_path": "composer.lock",
"new_path": "composer.lock",
"diff": "\"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies\",\n\"This file is @generated automatically\"\n],\n- \"content-hash\": \"19e62f2630000fd453b18dafc9037ff7\",\n+ \"content-hash\": \"d58f41c7a72754a28205d42b42554aad\",\n\"packages\": [\n- {\n- \"name\": \"api-platform/api-pack\",\n- \"version\": \"1.1.0\",\n- \"source\": {\n- \"type\": \"git\",\n- \"url\": \"https://github.com/api-platform/api-pack.git\",\n- \"reference\": \"33ade8a1dc23868828788fe1bf3e54291ce54843\"\n- },\n- \"dist\": {\n- \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/api-platform/api-pack/zipball/33ade8a1dc23868828788fe1bf3e54291ce54843\",\n- \"reference\": \"33ade8a1dc23868828788fe1bf3e54291ce54843\",\n- \"shasum\": \"\"\n- },\n- \"require\": {\n- \"api-platform/core\": \"^2.1\",\n- \"doctrine/annotations\": \"^1.0\",\n- \"doctrine/doctrine-bundle\": \"^1.6\",\n- \"doctrine/orm\": \"^2.4.5\",\n- \"nelmio/cors-bundle\": \"^1.5\",\n- \"php\": \"^7.0\",\n- \"phpdocumentor/reflection-docblock\": \"^3.0 || ^4.0\",\n- \"symfony/asset\": \"^3.0 || ^4.0\",\n- \"symfony/expression-language\": \"^3.0 || ^4.0\",\n- \"symfony/security-bundle\": \"^3.0 || ^4.0\",\n- \"symfony/twig-bundle\": \"^3.0 || ^4.0\",\n- \"symfony/validator\": \"^3.0 || ^4.0\"\n- },\n- \"type\": \"symfony-pack\",\n- \"notification-url\": \"https://packagist.org/downloads/\",\n- \"license\": [\n- \"MIT\"\n- ],\n- \"description\": \"A pack for API Platform\",\n- \"time\": \"2018-02-09T13:21:13+00:00\"\n- },\n{\n\"name\": \"api-platform/core\",\n\"version\": \"v2.3.5\",\n},\n{\n\"name\": \"bolt/common\",\n- \"version\": \"v2.0.3\",\n+ \"version\": \"2.0.4\",\n\"source\": {\n\"type\": \"git\",\n\"url\": \"https://github.com/bolt/common.git\",\n- \"reference\": \"27651960b274b21d2a976a15508380e3f08d0c34\"\n+ \"reference\": \"b88b47ad7ca9214d11d4c89e56ca6eb1023b1b80\"\n},\n\"dist\": {\n\"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/bolt/common/zipball/27651960b274b21d2a976a15508380e3f08d0c34\",\n- \"reference\": \"27651960b274b21d2a976a15508380e3f08d0c34\",\n+ \"url\": \"https://api.github.com/repos/bolt/common/zipball/b88b47ad7ca9214d11d4c89e56ca6eb1023b1b80\",\n+ \"reference\": \"b88b47ad7ca9214d11d4c89e56ca6eb1023b1b80\",\n\"shasum\": \"\"\n},\n\"require\": {\n}\n],\n\"description\": \"Common utilities for all Bolt libraries\",\n- \"time\": \"2019-01-04T08:49:51+00:00\"\n+ \"time\": \"2019-01-04T12:39:16+00:00\"\n},\n{\n\"name\": \"cocur/slugify\",\n\"homepage\": \"https://symfony.com\",\n\"time\": \"2018-11-11T19:52:12+00:00\"\n},\n- {\n- \"name\": \"symfony/debug-pack\",\n- \"version\": \"v1.0.7\",\n- \"source\": {\n- \"type\": \"git\",\n- \"url\": \"https://github.com/symfony/debug-pack.git\",\n- \"reference\": \"09a4a1e9bf2465987d4f79db0ad6c11cc632bc79\"\n- },\n- \"dist\": {\n- \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/symfony/debug-pack/zipball/09a4a1e9bf2465987d4f79db0ad6c11cc632bc79\",\n- \"reference\": \"09a4a1e9bf2465987d4f79db0ad6c11cc632bc79\",\n- \"shasum\": \"\"\n- },\n- \"require\": {\n- \"easycorp/easy-log-handler\": \"^1.0.7\",\n- \"php\": \"^7.0\",\n- \"symfony/debug-bundle\": \"*\",\n- \"symfony/monolog-bundle\": \"^3.0\",\n- \"symfony/profiler-pack\": \"*\",\n- \"symfony/var-dumper\": \"*\"\n- },\n- \"type\": \"symfony-pack\",\n- \"notification-url\": \"https://packagist.org/downloads/\",\n- \"license\": [\n- \"MIT\"\n- ],\n- \"description\": \"A debug pack for Symfony projects\",\n- \"time\": \"2018-12-10T12:11:11+00:00\"\n- },\n{\n\"name\": \"symfony/dependency-injection\",\n\"version\": \"v4.2.1\",\n],\n\"time\": \"2018-11-11T19:52:12+00:00\"\n},\n- {\n- \"name\": \"symfony/orm-pack\",\n- \"version\": \"v1.0.5\",\n- \"source\": {\n- \"type\": \"git\",\n- \"url\": \"https://github.com/symfony/orm-pack.git\",\n- \"reference\": \"1b58f752cd917a08c9c8df020781d9c46a2275b1\"\n- },\n- \"dist\": {\n- \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/symfony/orm-pack/zipball/1b58f752cd917a08c9c8df020781d9c46a2275b1\",\n- \"reference\": \"1b58f752cd917a08c9c8df020781d9c46a2275b1\",\n- \"shasum\": \"\"\n- },\n- \"require\": {\n- \"doctrine/doctrine-bundle\": \"^1.6.10\",\n- \"doctrine/doctrine-migrations-bundle\": \"^1.3\",\n- \"doctrine/orm\": \"^2.5.11\",\n- \"php\": \"^7.0\"\n- },\n- \"type\": \"symfony-pack\",\n- \"notification-url\": \"https://packagist.org/downloads/\",\n- \"license\": [\n- \"MIT\"\n- ],\n- \"description\": \"A pack for the Doctrine ORM\",\n- \"time\": \"2017-12-12T01:47:50+00:00\"\n- },\n{\n\"name\": \"symfony/polyfill-ctype\",\n\"version\": \"v1.10.0\",\n],\n\"time\": \"2018-09-21T13:07:52+00:00\"\n},\n- {\n- \"name\": \"symfony/profiler-pack\",\n- \"version\": \"v1.0.4\",\n- \"source\": {\n- \"type\": \"git\",\n- \"url\": \"https://github.com/symfony/profiler-pack.git\",\n- \"reference\": \"99c4370632c2a59bb0444852f92140074ef02209\"\n- },\n- \"dist\": {\n- \"type\": \"zip\",\n- \"url\": \"https://api.github.com/repos/symfony/profiler-pack/zipball/99c4370632c2a59bb0444852f92140074ef02209\",\n- \"reference\": \"99c4370632c2a59bb0444852f92140074ef02209\",\n- \"shasum\": \"\"\n- },\n- \"require\": {\n- \"php\": \"^7.0\",\n- \"symfony/stopwatch\": \"*\",\n- \"symfony/twig-bundle\": \"*\",\n- \"symfony/web-profiler-bundle\": \"*\"\n- },\n- \"type\": \"symfony-pack\",\n- \"notification-url\": \"https://packagist.org/downloads/\",\n- \"license\": [\n- \"MIT\"\n- ],\n- \"description\": \"A pack for the Symfony web profiler\",\n- \"time\": \"2018-12-10T12:11:44+00:00\"\n- },\n{\n\"name\": \"symfony/property-access\",\n\"version\": \"v4.2.1\",\n}\n],\n\"aliases\": [],\n- \"minimum-stability\": \"dev\",\n+ \"minimum-stability\": \"stable\",\n\"stability-flags\": [],\n\"prefer-stable\": true,\n\"prefer-lowest\": false,\n"
},
{
"change_type": "MODIFY",
"old_path": "symfony.lock",
"new_path": "symfony.lock",
"diff": "{\n- \"api-platform/api-pack\": {\n- \"version\": \"1.1.0\"\n- },\n\"api-platform/core\": {\n\"version\": \"2.1\",\n\"recipe\": {\n\"ref\": \"de31e687f3964939abd1f66817bd96ed34bc2eee\"\n}\n},\n- \"symfony/debug-pack\": {\n- \"version\": \"v1.0.6\"\n- },\n\"symfony/dependency-injection\": {\n\"version\": \"v3.4.0-beta2\"\n},\n\"symfony/options-resolver\": {\n\"version\": \"v3.4.0-beta2\"\n},\n- \"symfony/orm-pack\": {\n- \"version\": \"v1.0.5\"\n- },\n\"symfony/phpunit-bridge\": {\n\"version\": \"3.3\",\n\"recipe\": {\n\"symfony/process\": {\n\"version\": \"v3.4.0-beta2\"\n},\n- \"symfony/profiler-pack\": {\n- \"version\": \"v1.0.3\"\n- },\n\"symfony/property-access\": {\n\"version\": \"v3.4.0-beta2\"\n},\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Putting `composer update` on a diet
|
95,112 |
04.01.2019 15:58:28
| -3,600 |
1d9c9135891476b50b3bbeaab9f3956635bd58ea
|
Fix marking Fixtures as services
|
[
{
"change_type": "MODIFY",
"old_path": "config/services.yaml",
"new_path": "config/services.yaml",
"diff": "@@ -23,7 +23,7 @@ services:\n# this creates a service per class whose id is the fully-qualified class name\nBolt\\:\nresource: '../src/*'\n- exclude: '../src/{Entity,Migrations,Tests,Kernel.php}'\n+ exclude: '../src/{DataFixtures,Entity,Migrations,Tests,Kernel.php}'\n# controllers are imported separately to make sure services can be injected\n# as action arguments even if you don't extend any base controller class\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Fix marking Fixtures as services
|
95,112 |
04.01.2019 17:17:33
| -3,600 |
f07f32aace208d070309562b546b951a745aa807
|
restore symfony.lock
|
[
{
"change_type": "MODIFY",
"old_path": ".gitignore",
"new_path": ".gitignore",
"diff": "@@ -22,6 +22,7 @@ Vagrantfile\n.*.swp\n.swp\n*.lock\n+!symfony.lock\n.buildpath\n.idea\n.vscode/*\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "symfony.lock",
"diff": "+{\n+ \"api-platform/core\": {\n+ \"version\": \"2.1\",\n+ \"recipe\": {\n+ \"repo\": \"github.com/symfony/recipes\",\n+ \"branch\": \"master\",\n+ \"version\": \"2.1\",\n+ \"ref\": \"18727d8f229306860b46955f438e1897421da689\"\n+ }\n+ },\n+ \"behat/transliterator\": {\n+ \"version\": \"v1.2.0\"\n+ },\n+ \"bolt/common\": {\n+ \"version\": \"v1.1.0\"\n+ },\n+ \"cocur/slugify\": {\n+ \"version\": \"v3.1\"\n+ },\n+ \"composer/ca-bundle\": {\n+ \"version\": \"1.0.8\"\n+ },\n+ \"composer/semver\": {\n+ \"version\": \"1.4.2\"\n+ },\n+ \"composer/xdebug-handler\": {\n+ \"version\": \"1.1.0\"\n+ },\n+ \"dama/doctrine-test-bundle\": {\n+ \"version\": \"v4.0.1\"\n+ },\n+ \"doctrine/annotations\": {\n+ \"version\": \"v1.5.0\"\n+ },\n+ \"doctrine/cache\": {\n+ \"version\": \"v1.7.1\"\n+ },\n+ \"doctrine/collections\": {\n+ \"version\": \"v1.5.0\"\n+ },\n+ \"doctrine/common\": {\n+ \"version\": \"v2.8.1\"\n+ },\n+ \"doctrine/data-fixtures\": {\n+ \"version\": \"v1.3.1\"\n+ },\n+ \"doctrine/dbal\": {\n+ \"version\": \"v2.6.2\"\n+ },\n+ \"doctrine/doctrine-bundle\": {\n+ \"version\": \"1.6\",\n+ \"recipe\": {\n+ \"repo\": \"github.com/symfony/recipes\",\n+ \"branch\": \"master\",\n+ \"version\": \"1.6\",\n+ \"ref\": \"f29d6af1f605b9494a2c9c3a73cb1cacc6cca19b\"\n+ }\n+ },\n+ \"doctrine/doctrine-cache-bundle\": {\n+ \"version\": \"1.3.2\"\n+ },\n+ \"doctrine/doctrine-fixtures-bundle\": {\n+ \"version\": \"3.0\",\n+ \"recipe\": {\n+ \"repo\": \"github.com/symfony/recipes\",\n+ \"branch\": \"master\",\n+ \"version\": \"3.0\",\n+ \"ref\": \"2ea6070ecf365f9a801ccaed4b31d4a3b7af5693\"\n+ }\n+ },\n+ \"doctrine/doctrine-migrations-bundle\": {\n+ \"version\": \"1.2\",\n+ \"recipe\": {\n+ \"repo\": \"github.com/symfony/recipes\",\n+ \"branch\": \"master\",\n+ \"version\": \"1.2\",\n+ \"ref\": \"c1431086fec31f17fbcfe6d6d7e92059458facc1\"\n+ }\n+ },\n+ \"doctrine/event-manager\": {\n+ \"version\": \"v1.0.0\"\n+ },\n+ \"doctrine/inflector\": {\n+ \"version\": \"v1.2.0\"\n+ },\n+ \"doctrine/instantiator\": {\n+ \"version\": \"1.1.0\"\n+ },\n+ \"doctrine/lexer\": {\n+ \"version\": \"v1.0.1\"\n+ },\n+ \"doctrine/migrations\": {\n+ \"version\": \"v1.6.0\"\n+ },\n+ \"doctrine/orm\": {\n+ \"version\": \"v2.5.12\"\n+ },\n+ \"doctrine/persistence\": {\n+ \"version\": \"v1.1.0\"\n+ },\n+ \"doctrine/reflection\": {\n+ \"version\": \"v1.0.0\"\n+ },\n+ \"easycorp/easy-log-handler\": {\n+ \"version\": \"1.0\",\n+ \"recipe\": {\n+ \"repo\": \"github.com/symfony/recipes\",\n+ \"branch\": \"master\",\n+ \"version\": \"1.0\",\n+ \"ref\": \"70062abc2cd58794d2a90274502f81b55cd9951b\"\n+ }\n+ },\n+ \"egulias/email-validator\": {\n+ \"version\": \"2.1.2\"\n+ },\n+ \"erusev/parsedown\": {\n+ \"version\": \"1.6.3\"\n+ },\n+ \"ezyang/htmlpurifier\": {\n+ \"version\": \"v4.9.3\"\n+ },\n+ \"friendsofphp/php-cs-fixer\": {\n+ \"version\": \"2.2\",\n+ \"recipe\": {\n+ \"repo\": \"github.com/symfony/recipes\",\n+ \"branch\": \"master\",\n+ \"version\": \"2.2\",\n+ \"ref\": \"9d60c231a92e69c68b89897813ec4931d0697b1f\"\n+ }\n+ },\n+ \"fzaninotto/faker\": {\n+ \"version\": \"v1.8.0\"\n+ },\n+ \"gecko-packages/gecko-php-unit\": {\n+ \"version\": \"v2.2\"\n+ },\n+ \"gedmo/doctrine-extensions\": {\n+ \"version\": \"v2.4.36\"\n+ },\n+ \"guzzlehttp/guzzle\": {\n+ \"version\": \"6.3.3\"\n+ },\n+ \"guzzlehttp/promises\": {\n+ \"version\": \"v1.3.1\"\n+ },\n+ \"guzzlehttp/psr7\": {\n+ \"version\": \"1.4.2\"\n+ },\n+ \"intervention/image\": {\n+ \"version\": \"2.4.2\"\n+ },\n+ \"jdorn/sql-formatter\": {\n+ \"version\": \"v1.2.17\"\n+ },\n+ \"jean85/pretty-package-versions\": {\n+ \"version\": \"1.2\"\n+ },\n+ \"knplabs/knp-menu\": {\n+ \"version\": \"2.3.0\"\n+ },\n+ \"knplabs/knp-menu-bundle\": {\n+ \"version\": \"v2.2.1\"\n+ },\n+ \"league/flysystem\": {\n+ \"version\": \"1.0.47\"\n+ },\n+ \"league/glide\": {\n+ \"version\": \"1.3.0\"\n+ },\n+ \"league/glide-symfony\": {\n+ \"version\": \"1.0.3\"\n+ },\n+ \"miljar/php-exif\": {\n+ \"version\": \"v0.6.4\"\n+ },\n+ \"monolog/monolog\": {\n+ \"version\": \"1.23.0\"\n+ },\n+ \"nelmio/cors-bundle\": {\n+ \"version\": \"1.5\",\n+ \"recipe\": {\n+ \"repo\": \"github.com/symfony/recipes\",\n+ \"branch\": \"master\",\n+ \"version\": \"1.5\",\n+ \"ref\": \"1fee84e00c71edee81aa54b470260779a890c9c6\"\n+ }\n+ },\n+ \"nesbot/carbon\": {\n+ \"version\": \"1.34.0\"\n+ },\n+ \"nette/bootstrap\": {\n+ \"version\": \"v2.4.6\"\n+ },\n+ \"nette/di\": {\n+ \"version\": \"v2.4.14\"\n+ },\n+ \"nette/finder\": {\n+ \"version\": \"v2.4.2\"\n+ },\n+ \"nette/neon\": {\n+ \"version\": \"v2.4.3\"\n+ },\n+ \"nette/php-generator\": {\n+ \"version\": \"v3.0.5\"\n+ },\n+ \"nette/robot-loader\": {\n+ \"version\": \"v3.1.0\"\n+ },\n+ \"nette/utils\": {\n+ \"version\": \"v2.5.3\"\n+ },\n+ \"nikic/php-parser\": {\n+ \"version\": \"v4.0.3\"\n+ },\n+ \"nyholm/nsa\": {\n+ \"version\": \"1.1.0\"\n+ },\n+ \"ocramius/package-versions\": {\n+ \"version\": \"1.1.3\"\n+ },\n+ \"ocramius/proxy-manager\": {\n+ \"version\": \"2.1.1\"\n+ },\n+ \"pagerfanta/pagerfanta\": {\n+ \"version\": \"v1.0.5\"\n+ },\n+ \"paragonie/random_compat\": {\n+ \"version\": \"v2.0.11\"\n+ },\n+ \"php-cs-fixer/diff\": {\n+ \"version\": \"v1.2.0\"\n+ },\n+ \"php-translation/common\": {\n+ \"version\": \"1.0.0\"\n+ },\n+ \"php-translation/extractor\": {\n+ \"version\": \"1.7.1\"\n+ },\n+ \"php-translation/symfony-bundle\": {\n+ \"version\": \"0.4\",\n+ \"recipe\": {\n+ \"repo\": \"github.com/symfony/recipes-contrib\",\n+ \"branch\": \"master\",\n+ \"version\": \"0.4\",\n+ \"ref\": \"ee15ad002114fba7b694a7fe429419b518d43bc4\"\n+ }\n+ },\n+ \"php-translation/symfony-storage\": {\n+ \"version\": \"1.0.1\"\n+ },\n+ \"phpdocumentor/reflection-common\": {\n+ \"version\": \"1.0.1\"\n+ },\n+ \"phpdocumentor/reflection-docblock\": {\n+ \"version\": \"4.3.0\"\n+ },\n+ \"phpdocumentor/type-resolver\": {\n+ \"version\": \"0.4.0\"\n+ },\n+ \"phpstan/phpdoc-parser\": {\n+ \"version\": \"0.3\"\n+ },\n+ \"phpstan/phpstan\": {\n+ \"version\": \"0.10.3\"\n+ },\n+ \"psr/cache\": {\n+ \"version\": \"1.0.1\"\n+ },\n+ \"psr/container\": {\n+ \"version\": \"1.0.0\"\n+ },\n+ \"psr/http-message\": {\n+ \"version\": \"1.0.1\"\n+ },\n+ \"psr/log\": {\n+ \"version\": \"1.0.2\"\n+ },\n+ \"psr/simple-cache\": {\n+ \"version\": \"1.0.0\"\n+ },\n+ \"ralouphie/getallheaders\": {\n+ \"version\": \"2.0.5\"\n+ },\n+ \"seld/jsonlint\": {\n+ \"version\": \"1.7.1\"\n+ },\n+ \"sensio/framework-extra-bundle\": {\n+ \"version\": \"4.0\",\n+ \"recipe\": {\n+ \"repo\": \"github.com/symfony/recipes\",\n+ \"branch\": \"master\",\n+ \"version\": \"4.0\",\n+ \"ref\": \"aaddfdf43cdecd4cf91f992052d76c2cadc04543\"\n+ }\n+ },\n+ \"sensiolabs/security-checker\": {\n+ \"version\": \"4.0\",\n+ \"recipe\": {\n+ \"repo\": \"github.com/symfony/recipes\",\n+ \"branch\": \"master\",\n+ \"version\": \"4.0\",\n+ \"ref\": \"576d653444dade07f272c889d52fe4594caa4fc3\"\n+ }\n+ },\n+ \"siriusphp/upload\": {\n+ \"version\": \"2.1.1\"\n+ },\n+ \"siriusphp/validation\": {\n+ \"version\": \"2.2.2\"\n+ },\n+ \"slam/php-cs-fixer-extensions\": {\n+ \"version\": \"v1.17.0\"\n+ },\n+ \"slevomat/coding-standard\": {\n+ \"version\": \"4.8.6\"\n+ },\n+ \"squizlabs/php_codesniffer\": {\n+ \"version\": \"3.0\",\n+ \"recipe\": {\n+ \"repo\": \"github.com/symfony/recipes-contrib\",\n+ \"branch\": \"master\",\n+ \"version\": \"3.0\",\n+ \"ref\": \"0dc9cceda799fd3a08b96987e176a261028a3709\"\n+ }\n+ },\n+ \"stof/doctrine-extensions-bundle\": {\n+ \"version\": \"1.2\",\n+ \"recipe\": {\n+ \"repo\": \"github.com/symfony/recipes-contrib\",\n+ \"branch\": \"master\",\n+ \"version\": \"1.2\",\n+ \"ref\": \"6c1ceb662f8997085f739cd089bfbef67f245983\"\n+ }\n+ },\n+ \"swiftmailer/swiftmailer\": {\n+ \"version\": \"v6.0.2\"\n+ },\n+ \"symfony/apache-pack\": {\n+ \"version\": \"1.0\",\n+ \"recipe\": {\n+ \"repo\": \"github.com/symfony/recipes-contrib\",\n+ \"branch\": \"master\",\n+ \"version\": \"1.0\",\n+ \"ref\": \"c82bead70f9a4f656354a193df7bf0ca2114efa0\"\n+ }\n+ },\n+ \"symfony/asset\": {\n+ \"version\": \"v3.4.0-beta2\"\n+ },\n+ \"symfony/browser-kit\": {\n+ \"version\": \"v3.4.0-beta2\"\n+ },\n+ \"symfony/cache\": {\n+ \"version\": \"v3.4.0-beta2\"\n+ },\n+ \"symfony/config\": {\n+ \"version\": \"v3.4.0-beta2\"\n+ },\n+ \"symfony/console\": {\n+ \"version\": \"3.3\",\n+ \"recipe\": {\n+ \"repo\": \"github.com/symfony/recipes\",\n+ \"branch\": \"master\",\n+ \"version\": \"3.3\",\n+ \"ref\": \"5ec5bb098bc693cd92f03390dd488ea0847cfcc7\"\n+ }\n+ },\n+ \"symfony/contracts\": {\n+ \"version\": \"v1.0.0\"\n+ },\n+ \"symfony/css-selector\": {\n+ \"version\": \"v3.4.0-beta2\"\n+ },\n+ \"symfony/debug\": {\n+ \"version\": \"v3.4.0-beta2\"\n+ },\n+ \"symfony/debug-bundle\": {\n+ \"version\": \"3.3\",\n+ \"recipe\": {\n+ \"repo\": \"github.com/symfony/recipes\",\n+ \"branch\": \"master\",\n+ \"version\": \"3.3\",\n+ \"ref\": \"de31e687f3964939abd1f66817bd96ed34bc2eee\"\n+ }\n+ },\n+ \"symfony/dependency-injection\": {\n+ \"version\": \"v3.4.0-beta2\"\n+ },\n+ \"symfony/doctrine-bridge\": {\n+ \"version\": \"v3.4.0-beta2\"\n+ },\n+ \"symfony/dom-crawler\": {\n+ \"version\": \"v3.4.0-beta2\"\n+ },\n+ \"symfony/dotenv\": {\n+ \"version\": \"v3.4.0-beta2\"\n+ },\n+ \"symfony/event-dispatcher\": {\n+ \"version\": \"v3.4.0-beta2\"\n+ },\n+ \"symfony/expression-language\": {\n+ \"version\": \"v3.4.0-beta2\"\n+ },\n+ \"symfony/filesystem\": {\n+ \"version\": \"v3.4.0-beta2\"\n+ },\n+ \"symfony/finder\": {\n+ \"version\": \"v3.4.0-beta2\"\n+ },\n+ \"symfony/flex\": {\n+ \"version\": \"1.0\",\n+ \"recipe\": {\n+ \"repo\": \"github.com/symfony/recipes\",\n+ \"branch\": \"master\",\n+ \"version\": \"1.0\",\n+ \"ref\": \"e921bdbfe20cdefa3b82f379d1cd36df1bc8d115\"\n+ }\n+ },\n+ \"symfony/form\": {\n+ \"version\": \"v3.4.0-beta2\"\n+ },\n+ \"symfony/framework-bundle\": {\n+ \"version\": \"3.3\",\n+ \"recipe\": {\n+ \"repo\": \"github.com/symfony/recipes\",\n+ \"branch\": \"master\",\n+ \"version\": \"3.3\",\n+ \"ref\": \"bcd70105a1e87e41f31af2ae84aaf948c8bfb189\"\n+ }\n+ },\n+ \"symfony/http-foundation\": {\n+ \"version\": \"v3.4.0-beta2\"\n+ },\n+ \"symfony/http-kernel\": {\n+ \"version\": \"v3.4.0-beta2\"\n+ },\n+ \"symfony/inflector\": {\n+ \"version\": \"v3.4.0-beta2\"\n+ },\n+ \"symfony/intl\": {\n+ \"version\": \"v3.4.0-beta2\"\n+ },\n+ \"symfony/maker-bundle\": {\n+ \"version\": \"1.0\",\n+ \"recipe\": {\n+ \"repo\": \"github.com/symfony/recipes\",\n+ \"branch\": \"master\",\n+ \"version\": \"1.0\",\n+ \"ref\": \"fadbfe33303a76e25cb63401050439aa9b1a9c7f\"\n+ }\n+ },\n+ \"symfony/monolog-bridge\": {\n+ \"version\": \"v3.4.0-beta2\"\n+ },\n+ \"symfony/monolog-bundle\": {\n+ \"version\": \"3.1\",\n+ \"recipe\": {\n+ \"repo\": \"github.com/symfony/recipes\",\n+ \"branch\": \"master\",\n+ \"version\": \"3.1\",\n+ \"ref\": \"94d0b0b417e988466de57cea583f83b396e44661\"\n+ }\n+ },\n+ \"symfony/options-resolver\": {\n+ \"version\": \"v3.4.0-beta2\"\n+ },\n+ \"symfony/phpunit-bridge\": {\n+ \"version\": \"3.3\",\n+ \"recipe\": {\n+ \"repo\": \"github.com/symfony/recipes\",\n+ \"branch\": \"master\",\n+ \"version\": \"3.3\",\n+ \"ref\": \"0a66a0097def4db1cd03bcb3d4a268440ae4cb47\"\n+ }\n+ },\n+ \"symfony/polyfill-ctype\": {\n+ \"version\": \"v1.8.0\"\n+ },\n+ \"symfony/polyfill-intl-icu\": {\n+ \"version\": \"v1.6.0\"\n+ },\n+ \"symfony/polyfill-mbstring\": {\n+ \"version\": \"v1.6.0\"\n+ },\n+ \"symfony/polyfill-php70\": {\n+ \"version\": \"v1.6.0\"\n+ },\n+ \"symfony/polyfill-php72\": {\n+ \"version\": \"v1.6.0\"\n+ },\n+ \"symfony/process\": {\n+ \"version\": \"v3.4.0-beta2\"\n+ },\n+ \"symfony/property-access\": {\n+ \"version\": \"v3.4.0-beta2\"\n+ },\n+ \"symfony/property-info\": {\n+ \"version\": \"v4.1.4\"\n+ },\n+ \"symfony/routing\": {\n+ \"version\": \"3.3\",\n+ \"recipe\": {\n+ \"repo\": \"github.com/symfony/recipes\",\n+ \"branch\": \"master\",\n+ \"version\": \"3.3\",\n+ \"ref\": \"5b2f0ee78c90d671860ac6450e37dec10fbc0719\"\n+ }\n+ },\n+ \"symfony/security-bundle\": {\n+ \"version\": \"3.3\",\n+ \"recipe\": {\n+ \"repo\": \"github.com/symfony/recipes\",\n+ \"branch\": \"master\",\n+ \"version\": \"3.3\",\n+ \"ref\": \"85834af1496735f28d831489d12ab1921a875e0d\"\n+ }\n+ },\n+ \"symfony/security-core\": {\n+ \"version\": \"v4.2.0\"\n+ },\n+ \"symfony/security-csrf\": {\n+ \"version\": \"v4.2.0\"\n+ },\n+ \"symfony/security-guard\": {\n+ \"version\": \"v4.2.0\"\n+ },\n+ \"symfony/security-http\": {\n+ \"version\": \"v4.2.0\"\n+ },\n+ \"symfony/serializer\": {\n+ \"version\": \"v4.1.4\"\n+ },\n+ \"symfony/stopwatch\": {\n+ \"version\": \"v3.4.0-beta2\"\n+ },\n+ \"symfony/swiftmailer-bundle\": {\n+ \"version\": \"2.5\",\n+ \"recipe\": {\n+ \"repo\": \"github.com/symfony/recipes\",\n+ \"branch\": \"master\",\n+ \"version\": \"2.5\",\n+ \"ref\": \"8daf8ede72274989fb0dc66b83cb4bc1693afbb9\"\n+ }\n+ },\n+ \"symfony/translation\": {\n+ \"version\": \"3.3\",\n+ \"recipe\": {\n+ \"repo\": \"github.com/symfony/recipes\",\n+ \"branch\": \"master\",\n+ \"version\": \"3.3\",\n+ \"ref\": \"58f37511a2ceec2761716413ce679cbe118e37c3\"\n+ }\n+ },\n+ \"symfony/twig-bridge\": {\n+ \"version\": \"v3.4.0-beta2\"\n+ },\n+ \"symfony/twig-bundle\": {\n+ \"version\": \"3.3\",\n+ \"recipe\": {\n+ \"repo\": \"github.com/symfony/recipes\",\n+ \"branch\": \"master\",\n+ \"version\": \"3.3\",\n+ \"ref\": \"42324de95dde296ef158f48d6cf7fefddd18da7d\"\n+ }\n+ },\n+ \"symfony/validator\": {\n+ \"version\": \"v3.4.0-beta2\"\n+ },\n+ \"symfony/var-dumper\": {\n+ \"version\": \"v3.4.0-beta2\"\n+ },\n+ \"symfony/var-exporter\": {\n+ \"version\": \"v4.2.0\"\n+ },\n+ \"symfony/web-profiler-bundle\": {\n+ \"version\": \"3.3\",\n+ \"recipe\": {\n+ \"repo\": \"github.com/symfony/recipes\",\n+ \"branch\": \"master\",\n+ \"version\": \"3.3\",\n+ \"ref\": \"6bdfa1a95f6b2e677ab985cd1af2eae35d62e0f6\"\n+ }\n+ },\n+ \"symfony/web-server-bundle\": {\n+ \"version\": \"3.3\",\n+ \"recipe\": {\n+ \"repo\": \"github.com/symfony/recipes\",\n+ \"branch\": \"master\",\n+ \"version\": \"3.3\",\n+ \"ref\": \"c72d107d077f1654428edaed69415d0228c1aefe\"\n+ }\n+ },\n+ \"symfony/webpack-encore-bundle\": {\n+ \"version\": \"1.0\",\n+ \"recipe\": {\n+ \"repo\": \"github.com/symfony/recipes\",\n+ \"branch\": \"master\",\n+ \"version\": \"1.0\",\n+ \"ref\": \"4c97a884bc54a4e66bb2d0785ca855141880b6a8\"\n+ }\n+ },\n+ \"symfony/yaml\": {\n+ \"version\": \"v3.4.0-beta2\"\n+ },\n+ \"symplify/better-phpdoc-parser\": {\n+ \"version\": \"v5.2.3\"\n+ },\n+ \"symplify/coding-standard\": {\n+ \"version\": \"v5.2.3\"\n+ },\n+ \"symplify/easy-coding-standard\": {\n+ \"version\": \"v5.2.3\"\n+ },\n+ \"symplify/package-builder\": {\n+ \"version\": \"v5.2.3\"\n+ },\n+ \"symplify/token-runner\": {\n+ \"version\": \"v5.2.3\"\n+ },\n+ \"thecodingmachine/safe\": {\n+ \"version\": \"v0.1.8\"\n+ },\n+ \"tightenco/collect\": {\n+ \"version\": \"v5.7.6\"\n+ },\n+ \"twig/extensions\": {\n+ \"version\": \"1.0\",\n+ \"recipe\": {\n+ \"repo\": \"github.com/symfony/recipes\",\n+ \"branch\": \"master\",\n+ \"version\": \"1.0\",\n+ \"ref\": \"4851df0afc426b8f07204379d21fca25b6df5d68\"\n+ }\n+ },\n+ \"twig/twig\": {\n+ \"version\": \"v2.4.4\"\n+ },\n+ \"webmozart/assert\": {\n+ \"version\": \"1.3.0\"\n+ },\n+ \"webmozart/path-util\": {\n+ \"version\": \"2.3.0\"\n+ },\n+ \"webonyx/graphql-php\": {\n+ \"version\": \"v0.12.6\"\n+ },\n+ \"white-october/pagerfanta-bundle\": {\n+ \"version\": \"v1.0.8\"\n+ },\n+ \"willdurand/negotiation\": {\n+ \"version\": \"v2.3.1\"\n+ },\n+ \"zendframework/zend-code\": {\n+ \"version\": \"3.3.0\"\n+ },\n+ \"zendframework/zend-eventmanager\": {\n+ \"version\": \"3.2.0\"\n+ }\n+}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
restore symfony.lock
|
95,144 |
04.01.2019 17:36:00
| -3,600 |
08bd9865e4eccb8811f2bca2ba79dc55f0414308
|
Some minor JS cleanup (with Prettier)
`prettier --single-quote --write assets/js/app/editor/Components/**/*`
|
[
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/Editor/Date/Date.vue",
"new_path": "assets/js/app/editor/Components/Editor/Date/Date.vue",
"diff": ":class=\"{ 'btn-outline-secondary': disabled == 1 }\"\ntype=\"button\"\n:disabled=\"disabled == 1\"\n- data-toggle>\n+ data-toggle\n+ >\n<i class=\"fa fa-calendar\">\n<span aria-hidden=\"true\" class=\"sr-only\">Toggle</span>\n</i>\n<script>\nimport value from '../../../mixins/value';\nimport flatPickr from 'vue-flatpickr-component';\n-import { Spanish } from \"flatpickr/dist/l10n/es.js\"\n+import { Spanish } from 'flatpickr/dist/l10n/es.js';\nimport { resolve } from 'path';\nexport default {\n-\n- name: \"editor-date\",\n+ name: 'editor-date',\nmixins: [value],\n@@ -46,33 +46,35 @@ export default {\nprops: {\nvalue: {\ntype: String,\n- required: false,\n+ required: false\n},\nname: {\ntype: String,\n- required: true,\n+ required: true\n},\ndisabled: {\ntype: String,\n- required: true,\n+ required: true\n},\nmode: {\ntype: String,\nrequired: true,\n- default: \"date\"\n+ default: 'date'\n},\nform: {\ntype: String,\nrequired: true\n},\nlocale: {\n- type: String,\n+ type: String\n}\n},\ncreated() {\nif (this.locale !== 'en') {\n- const lang = require(`flatpickr/dist/l10n/${this.locale}.js`).default[this.locale];\n+ const lang = require(`flatpickr/dist/l10n/${this.locale}.js`).default[\n+ this.locale\n+ ];\nthis.config.locale = lang;\n}\nif (this.mode === 'datetime') {\n@@ -81,9 +83,7 @@ export default {\n}\n},\n- mounted() {\n-\n- },\n+ mounted() {},\ndata: () => {\nreturn {\n@@ -92,10 +92,9 @@ export default {\naltFormat: 'F j, Y',\naltInput: true,\ndateFormat: 'Z',\n- enableTime: false,\n- }\n+ enableTime: false\n}\n+ };\n}\n-\n};\n</script>\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/Editor/Date/index.md",
"new_path": "assets/js/app/editor/Components/Editor/Date/index.md",
"diff": "#### Props\n| Name | Type |\n-| ------------- |-------------- |\n+| -------- | --------- |\n| value | `string` |\n| name | `string` |\n| disabled | `boolean` |\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/Editor/Html/Html.vue",
"new_path": "assets/js/app/editor/Components/Editor/Html/Html.vue",
"diff": "<template>\n<div>\n- <trumbowyg :id=\"name\" :name=\"name\" v-model=\"val\" :config=\"config\" ></trumbowyg>\n+ <trumbowyg\n+ :id=\"name\"\n+ :name=\"name\"\n+ v-model=\"val\"\n+ :config=\"config\"\n+ ></trumbowyg>\n</div>\n</template>\n@@ -9,7 +14,7 @@ import trumbowyg from 'vue-trumbowyg';\nimport 'trumbowyg/dist/ui/trumbowyg.css';\nexport default {\n- name: \"editor-html\",\n+ name: 'editor-html',\nprops: ['value', 'label', 'name'],\ncomponents: {\ntrumbowyg\n@@ -32,10 +37,10 @@ export default {\n['horizontalRule'],\n['removeformat'],\n['fullscreen'],\n- ['viewHTML'],\n+ ['viewHTML']\n]\n}\n};\n- },\n+ }\n};\n</script>\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/Editor/Image/Image.vue",
"new_path": "assets/js/app/editor/Components/Editor/Image/Image.vue",
"diff": "<div class=\"row\">\n<div class=\"col-8\">\n<div class=\"input-group mb-3\">\n- <input :name=\"name + '[media]'\" type=\"hidden\" :value=\"media\">\n- <input :name=\"name + '[filename]'\" type=\"text\" class=\"form-control\" placeholder=\"filename\" :value=\"filename\">\n+ <input :name=\"name + '[media]'\" type=\"hidden\" :value=\"media\" />\n+ <input\n+ :name=\"name + '[filename]'\"\n+ type=\"text\"\n+ class=\"form-control\"\n+ placeholder=\"filename\"\n+ :value=\"filename\"\n+ />\n</div>\n<div class=\"input-group mb-3\">\n- <input :name=\"name + '[alt]'\" type=\"text\" class=\"form-control\" placeholder=\"alt text\" :value=\"alt\">\n+ <input\n+ :name=\"name + '[alt]'\"\n+ type=\"text\"\n+ class=\"form-control\"\n+ placeholder=\"alt text\"\n+ :value=\"alt\"\n+ />\n</div>\n<div class=\"input-group mb-3\">\n- <input :name=\"name + '[title]'\" type=\"text\" class=\"form-control\" placeholder=\"title\" :value=\"title\">\n+ <input\n+ :name=\"name + '[title]'\"\n+ type=\"text\"\n+ class=\"form-control\"\n+ placeholder=\"title\"\n+ :value=\"title\"\n+ />\n</div>\n<div class=\"btn-toolbar\" role=\"toolbar\">\n<div class=\"btn-group mr-2\" role=\"group\">\n:aria-valuenow=\"progress\"\naria-valuemin=\"0\"\naria-valuemax=\"100\"\n- :style=\"`width: ${progress}%`\">\n- </div>\n+ :style=\"`width: ${progress}%`\"\n+ ></div>\n</div>\n</div>\n<div class=\"col-4\">\n</div>\n</div>\n</div>\n- <input :name=\"fieldName\" type=\"file\" @change=\"uploadFile($event.target.files[0])\" ref=\"selectFile\" class=\"editor__image--upload\">\n+ <input\n+ :name=\"fieldName\"\n+ type=\"file\"\n+ @change=\"uploadFile($event.target.files[0]);\"\n+ ref=\"selectFile\"\n+ class=\"editor__image--upload\"\n+ />\n</div>\n</template>\n@@ -67,8 +91,17 @@ import baguetteBox from 'baguettebox.js';\nimport field from '../../../mixins/value';\nexport default {\n- name: \"editor-image\",\n- props: ['label', 'filename', 'name', 'thumbnail', 'alt', 'title', 'directory', 'media'],\n+ name: 'editor-image',\n+ props: [\n+ 'label',\n+ 'filename',\n+ 'name',\n+ 'thumbnail',\n+ 'alt',\n+ 'title',\n+ 'directory',\n+ 'media'\n+ ],\nmixins: [field],\nmounted() {\nthis.previewImage = this.thumbnail;\n@@ -76,10 +109,10 @@ export default {\nupdated() {\nbaguetteBox.run('.editor__image--preview', {\nafterShow: () => {\n- noScroll.on()\n+ noScroll.on();\n},\nafterHide: () => {\n- noScroll.off()\n+ noScroll.off();\n}\n});\n},\n@@ -93,7 +126,7 @@ export default {\n},\nmethods: {\nselectFile() {\n- this.$refs.selectFile.click()\n+ this.$refs.selectFile.click();\n},\nonDragEnter(e) {\ne.preventDefault();\n@@ -104,8 +137,7 @@ export default {\nonDragLeave(e) {\ne.preventDefault();\nthis.dragCount--;\n- if (this.dragCount <= 0)\n- this.isDragging = false;\n+ if (this.dragCount <= 0) this.isDragging = false;\n},\nonDrop(e) {\ne.preventDefault();\n@@ -118,8 +150,10 @@ export default {\nconst thumbnailParams = this.thumbnail.split('?').pop();\nconst fd = new FormData();\nconst config = {\n- onUploadProgress: (progressEvent) => {\n- const percentCompleted = Math.round( (progressEvent.loaded * 100) / progressEvent.total )\n+ onUploadProgress: progressEvent => {\n+ const percentCompleted = Math.round(\n+ (progressEvent.loaded * 100) / progressEvent.total\n+ );\nthis.progress = percentCompleted;\n},\nheaders: {\n@@ -127,7 +161,8 @@ export default {\n}\n};\nfd.append('image', file);\n- this.$axios.post(this.directory, fd, config)\n+ this.$axios\n+ .post(this.directory, fd, config)\n.then(res => {\nthis.filename = res.data;\nthis.previewImage = `/thumbs/${res.data}?${thumbnailParams}`;\n@@ -136,12 +171,12 @@ export default {\n.catch(err => {\nconsole.log(err);\nthis.progress = 0;\n- })\n- },\n+ });\n+ }\n},\ncomputed: {\nfieldName() {\n- return this.name + '[]'\n+ return this.name + '[]';\n}\n}\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/Editor/Markdown/Markdown.vue",
"new_path": "assets/js/app/editor/Components/Editor/Markdown/Markdown.vue",
"diff": "<template>\n<div>\n- <markdown-editor :name=\"name\" :id=\"name\" v-model=\"val\" :configs=\"config\"></markdown-editor>\n+ <markdown-editor\n+ :name=\"name\"\n+ :id=\"name\"\n+ v-model=\"val\"\n+ :configs=\"config\"\n+ ></markdown-editor>\n</div>\n</template>\n<script>\n-import markdownEditor from 'vue-simplemde/src/markdown-editor'\n+import markdownEditor from 'vue-simplemde/src/markdown-editor';\nexport default {\n- name: \"editor-markdown\",\n+ name: 'editor-markdown',\nprops: ['value', 'label', 'name'],\ncomponents: {\nmarkdownEditor\n@@ -25,7 +30,7 @@ export default {\ntoggleFullScreen: true\n}\n};\n- },\n+ }\n};\n</script>\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/Editor/Number/Number.vue",
"new_path": "assets/js/app/editor/Components/Editor/Number/Number.vue",
"diff": "type=\"number\"\n:step=\"step\"\nv-model=\"val\"\n- >\n+ />\n</div>\n</template>\nimport val from '../../../mixins/value';\nexport default {\n- name: \"editor-number\",\n+ name: 'editor-number',\nprops: ['value', 'label', 'name', 'step', 'type', 'disabled'],\n- mixins: [val],\n+ mixins: [val]\n};\n</script>\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/Editor/Select/Select.vue",
"new_path": "assets/js/app/editor/Components/Editor/Select/Select.vue",
"diff": "@tag=\"addTag\"\n>\n<template slot=\"singleLabel\" slot-scope=\"props\" v-if=\"name === 'status'\">\n- <span class=\"status mr-2\" :class=\"`is-${props.option.key}`\"></span>{{props.option.key}}\n+ <span class=\"status mr-2\" :class=\"`is-${props.option.key}`\"></span>\n+ {{ props.option.key }}\n</template>\n<template slot=\"option\" slot-scope=\"props\" v-if=\"name === 'status'\">\n- <span class=\"status mr-2\" :class=\"`is-${props.option.key}`\"></span>{{props.option.key}}\n+ <span class=\"status mr-2\" :class=\"`is-${props.option.key}`\"></span>\n+ {{ props.option.key }}\n</template>\n</multiselect>\n<input\n:name=\"fieldName\"\n:form=\"form\"\n:value=\"sanitized\"\n- >\n+ />\n</div>\n</template>\n<script>\n-import Multiselect from 'vue-multiselect'\n+import Multiselect from 'vue-multiselect';\nexport default {\n- name: \"editor-select\",\n+ name: 'editor-select',\nprops: ['value', 'name', 'id', 'form', 'options', 'multiple', 'taggable'],\ncomponents: { Multiselect },\nmounted() {\n@@ -44,24 +46,29 @@ export default {\nlet filterSelectedItems = _options.filter(item => {\nreturn _values.includes(item.key) || _values == item.key;\n- })\n+ });\nthis.selected = filterSelectedItems;\n},\ndata: () => {\nreturn {\n- selected: [],\n- }\n+ selected: []\n+ };\n},\ncomputed: {\nsanitized() {\nlet filtered;\n+ if (this.multiple) {\nfiltered = this.selected.map(item => item.key);\nreturn JSON.stringify(filtered);\n+ } else {\n+ filtered = [this.selected];\n+ return JSON.stringify(filtered[0].key);\n+ }\n},\nfieldName() {\n- return this.name + '[]'\n- },\n+ return this.name + '[]';\n+ }\n},\nmethods: {\naddTag(newTag) {\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/Editor/Slug/Slug.vue",
"new_path": "assets/js/app/editor/Components/Editor/Slug/Slug.vue",
"diff": ":class=\"fieldClass\"\n:readonly=\"!edit\"\nv-model=\"val\"\n- >\n+ />\n<div class=\"input-group-append\">\n<button\ntype=\"button\"\n<i class=\"fas fa-lock fa-fw\"></i> Lock\n</template>\n</a>\n- <a class=\"dropdown-item\" @click=\"generateSlug()\">\n+ <a class=\"dropdown-item\" @click=\"generateSlug();\">\n<i class=\"fas fa-link fa-fw\"></i> Generate from: {{ generate }}\n</a>\n</div>\nimport field from '../../../mixins/value';\nexport default {\n- name: \"editor-slug\",\n+ name: 'editor-slug',\nprops: ['value', 'label', 'name', 'prefix', 'fieldClass', 'generate'],\nmixins: [field],\ndata: () => {\n@@ -58,7 +58,9 @@ export default {\n},\nmounted() {\nsetTimeout(() => {\n- const title = document.querySelector(`input[name='fields[${this.generate}]']`).value;\n+ const title = document.querySelector(\n+ `input[name='fields[${this.generate}]']`\n+ ).value;\nif (title.length <= 0) {\nthis.$root.$emit('generate-from-title', true);\n}\n@@ -70,27 +72,28 @@ export default {\nthis.$root.$emit('generate-from-title', false);\nif (!this.edit) {\nthis.edit = true;\n- this.buttonText = \"Edit\"\n- this.icon = 'pencil-alt'\n+ this.buttonText = 'Edit';\n+ this.icon = 'pencil-alt';\n} else {\n- const slug = this.$options.filters.slugify(this.val)\n+ const slug = this.$options.filters.slugify(this.val);\nthis.val = slug;\nthis.edit = false;\n- this.buttonText = \"Locked\"\n- this.icon = 'lock'\n+ this.buttonText = 'Locked';\n+ this.icon = 'lock';\n}\n},\ngenerateSlug() {\n- const title = document.querySelector(`input[name='fields[${this.generate}]']`).value;\n+ const title = document.querySelector(\n+ `input[name='fields[${this.generate}]']`\n+ ).value;\nconst slug = this.$options.filters.slugify(title);\nthis.val = slug;\nthis.$root.$emit('generate-from-title', true);\nthis.edit = false;\n- this.buttonText = \"Locked\"\n- this.icon = 'lock'\n+ this.buttonText = 'Locked';\n+ this.icon = 'lock';\n}\n}\n};\n</script>\n-\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/Editor/Text/Text.vue",
"new_path": "assets/js/app/editor/Components/Editor/Text/Text.vue",
"diff": "type=\"text\"\nv-model=\"val\"\n:disabled=\"disabled == 1\"\n- >\n+ />\n</div>\n</template>\nimport field from '../../../mixins/value';\nexport default {\n- name: \"editor-text\",\n+ name: 'editor-text',\nprops: ['value', 'label', 'name', 'type', 'disabled', 'id'],\nmixins: [field],\nmounted() {\n- this.$root.$on('generate-from-title', data => this.generate = data);\n+ this.$root.$on('generate-from-title', data => (this.generate = data));\n},\ndata: () => {\nreturn {\n@@ -38,7 +38,7 @@ export default {\ncomputed: {\ngetType() {\nif (this.type === 'large') {\n- return 'form-control-lg'\n+ return 'form-control-lg';\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/Editor/Textarea/Textarea.vue",
"new_path": "assets/js/app/editor/Components/Editor/Textarea/Textarea.vue",
"diff": "import field from '../../../mixins/value';\nexport default {\n- name: \"editor-textarea\",\n+ name: 'editor-textarea',\nprops: ['value', 'label', 'name'],\n- mixins: [field],\n+ mixins: [field]\n};\n</script>\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/Editor/index.js",
"new_path": "assets/js/app/editor/Components/Editor/index.js",
"diff": "@@ -13,15 +13,4 @@ import Textarea from './Textarea/Textarea';\nimport Image from './Image/Image';\n-\n-export {\n- Text,\n- Slug,\n- Number,\n- Date,\n- Select,\n- Html,\n- Markdown,\n- Textarea,\n- Image\n-};\n+export { Text, Slug, Number, Date, Select, Html, Markdown, Textarea, Image };\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/General/Language/Language.vue",
"new_path": "assets/js/app/editor/Components/General/Language/Language.vue",
"diff": ":searchable=\"false\"\n:show-labels=\"false\"\n:limit=\"1\"\n- @input=\"switchLocale()\"\n+ @input=\"switchLocale();\"\n>\n<template slot=\"singleLabel\" slot-scope=\"props\">\n+ <span class=\"fp mr-1\" :class=\"props.option.flag\"></span>\n<span\n- class=\"fp mr-1\"\n- :class=\"props.option.flag\"\n- ></span>\n- <span>{{props.option.name}} <small style=\"white-space: nowrap\">({{props.option.code}})</small></span>\n+ >{{ props.option.name }}\n+ <small style=\"white-space: nowrap\"\n+ >({{ props.option.code }})</small\n+ ></span\n+ >\n</template>\n<template slot=\"option\" slot-scope=\"props\">\n+ <span class=\"fp mr-1\" :class=\"props.option.flag\"></span>\n<span\n- class=\"fp mr-1\"\n- :class=\"props.option.flag\"\n- ></span>\n- <span>{{props.option.name}} <small style=\"white-space: nowrap\">({{props.option.code}})</small></span>\n+ >{{ props.option.name }}\n+ <small style=\"white-space: nowrap\"\n+ >({{ props.option.code }})</small\n+ ></span\n+ >\n</template>\n</multiselect>\n-\n</div>\n</template>\n<script>\n-import Multiselect from 'vue-multiselect'\n+import Multiselect from 'vue-multiselect';\nexport default {\n-\n- name: \"editor-language\",\n+ name: 'editor-language',\ncomponents: { Multiselect },\nprops: ['label', 'locales', 'current'],\n-\nmounted() {\nconst url = new URLSearchParams(window.location.search);\n-\n-\nif (this.current) {\n-\n- let current = this.locales.filter(locale =>\n- locale.code === this.current\n- )\n+ let current = this.locales.filter(locale => locale.code === this.current);\nif (current.length > 0) {\nthis.locale = current[0];\n} else {\n- this.locale = this.locales[0]\n+ this.locale = this.locales[0];\n}\n-\n} else {\n-\n- this.locale = this.locales[0]\n-\n+ this.locale = this.locales[0];\n}\n},\ndata: () => {\nreturn {\nlocale: {}\n- }\n+ };\n},\nmethods: {\nswitchLocale() {\nconst locale = this.locale.link;\n- return window.location.href = locale;\n+ return (window.location.href = locale);\n}\n}\n-\n};\n</script>\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/General/index.js",
"new_path": "assets/js/app/editor/Components/General/index.js",
"diff": "import Language from './Language/Language';\n-export {\n- Language\n-};\n\\ No newline at end of file\n+export { Language };\n"
},
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"build\": \"encore production --progress\",\n\"test\": \"jest\"\n},\n+ \"eslintConfig\": {\n+ \"root\": true,\n+ \"extends\": [\n+ \"plugin:vue/essential\",\n+ \"eslint:recommended\"\n+ ]\n+ },\n\"browserslist\": [\n\"> 1%\"\n],\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Some minor JS cleanup (with Prettier)
`prettier --single-quote --write assets/js/app/editor/Components/**/*`
|
95,112 |
04.01.2019 17:37:11
| -3,600 |
023053681af039f685273f9c4b14bd776a44937d
|
fix travis once again
|
[
{
"change_type": "MODIFY",
"old_path": ".travis.yml",
"new_path": ".travis.yml",
"diff": "@@ -9,7 +9,6 @@ matrix:\nfast_finish: true\ninclude:\n- php: 7.1.18\n- env: COMPOSER_FLAGS=\"--prefer-lowest\"\n- php: 7.2\n- php: 7.3\n- php: nightly\n@@ -22,7 +21,7 @@ before_install:\n- composer self-update\ninstall:\n- - COMPOSER_MEMORY_LIMIT=-1 composer update $COMPOSER_FLAGS\n+ - COMPOSER_MEMORY_LIMIT=-1 composer install $COMPOSER_FLAGS\n- nvm install 8.2\n- npm install\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
fix travis once again
|
95,144 |
08.01.2019 07:21:28
| -3,600 |
eb9ae9060aa333978bb0433a072207948fa0b838
|
[chore] NPM update, because of security warning
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"simplemde\": \"^1.11.2\",\n\"tinycolor2\": \"^1.4.1\",\n\"vue\": \"^2.5.21\",\n- \"vue-flatpickr-component\": \"^8.1.0\",\n+ \"vue-flatpickr-component\": \"^8.1.1\",\n\"vue-multiselect\": \"^2.1.3\",\n\"vue-notification\": \"^1.3.14\",\n\"vue-simplemde\": \"^0.5.1\",\n\"@babel/plugin-transform-runtime\": \"^7.2.0\",\n\"@babel/polyfill\": \"^7.2.5\",\n\"@babel/preset-env\": \"^7.2.3\",\n- \"@symfony/webpack-encore\": \"^0.22.2\",\n+ \"@symfony/webpack-encore\": \"^0.22.4\",\n\"@vue/test-utils\": \"^1.0.0-beta.28\",\n\"ajv-keywords\": \"^3.2.0\",\n\"autoprefixer\": \"^9.4.4\",\n\"babel-core\": \"^7.0.0-bridge.0\",\n\"babel-jest\": \"^23.6.0\",\n- \"eslint\": \"5.11.1\",\n+ \"eslint\": \"5.12.0\",\n\"eslint-config-prettier\": \"^3.3.0\",\n\"eslint-plugin-prettier\": \"^3.0.1\",\n\"eslint-plugin-vue\": \"^5.1.0\",\n\"register-service-worker\": \"^1.5.2\",\n\"sass-loader\": \"^7.1.0\",\n\"vue-jest\": \"^3.0.2\",\n- \"vue-loader\": \"^15.4.2\",\n+ \"vue-loader\": \"^15.5.0\",\n\"vue-router\": \"^3.0.2\",\n\"vue-template-compiler\": \"^2.5.21\",\n\"webpackbar\": \"^3.1.4\",\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
[chore] NPM update, because of security warning
|
95,112 |
08.01.2019 17:36:18
| -3,600 |
c6932419270efc5dd9b5e2abb063785c60dcc539
|
Examples how to write Unit tests with 4 different ways
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": ".phpspec.yml",
"diff": "+suites:\n+ default:\n+ spec_path: tests\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "Makefile",
"new_path": "Makefile",
"diff": "@@ -29,11 +29,17 @@ csfix:\nvendor/bin/ecs check src --fix\nmake stancheck\n+csfix-tests:\n+ make csclear\n+ vendor/bin/ecs check tests/php --fix\n+ make stancheck\n+\nstancheck:\nvendor/bin/phpstan --memory-limit=1G analyse -c phpstan.neon src\ntest:\nvendor/bin/phpunit\n+ vendor/bin/phpspec run\ndb-create:\nbin/console doctrine:database:create\n"
},
{
"change_type": "MODIFY",
"old_path": "composer.json",
"new_path": "composer.json",
"diff": "\"ext-pdo_sqlite\": \"*\",\n\"dama/doctrine-test-bundle\": \"^5.0\",\n\"doctrine/doctrine-fixtures-bundle\": \"^3.0\",\n+ \"mockery/mockery\": \"^1.2\",\n+ \"phpspec/phpspec\": \"^5.1\",\n+ \"phpspec/prophecy\": \"^1.8\",\n\"phpstan/phpstan\": \"^0.10.3\",\n\"phpunit/phpunit\": \"^7.0\",\n\"symfony/browser-kit\": \"^4.2\",\n"
},
{
"change_type": "MODIFY",
"old_path": "symfony.lock",
"new_path": "symfony.lock",
"diff": "\"guzzlehttp/psr7\": {\n\"version\": \"1.4.2\"\n},\n+ \"hamcrest/hamcrest-php\": {\n+ \"version\": \"v2.0.0\"\n+ },\n\"intervention/image\": {\n\"version\": \"2.4.2\"\n},\n\"miljar/php-exif\": {\n\"version\": \"v0.6.4\"\n},\n+ \"mockery/mockery\": {\n+ \"version\": \"1.2.0\"\n+ },\n\"monolog/monolog\": {\n\"version\": \"1.23.0\"\n},\n\"phpdocumentor/type-resolver\": {\n\"version\": \"0.4.0\"\n},\n+ \"phpspec/php-diff\": {\n+ \"version\": \"v1.1.0\"\n+ },\n+ \"phpspec/phpspec\": {\n+ \"version\": \"5.1.0\"\n+ },\n\"phpstan/phpdoc-parser\": {\n\"version\": \"0.3\"\n},\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "tests/php/Security/LoginFormAuthenticatorMockBuilderTest.php",
"diff": "+<?php\n+\n+declare(strict_types=1);\n+\n+namespace Bolt\\Tests\\Security;\n+\n+use Bolt\\Entity\\User;\n+use Bolt\\Repository\\UserRepository;\n+use Bolt\\Security\\LoginFormAuthenticator;\n+use Symfony\\Component\\HttpFoundation\\Request;\n+use Symfony\\Component\\Routing\\RouterInterface;\n+use Symfony\\Component\\Security\\Core\\Encoder\\UserPasswordEncoderInterface;\n+use Symfony\\Component\\Security\\Core\\Exception\\InvalidCsrfTokenException;\n+use Symfony\\Component\\Security\\Core\\User\\UserProviderInterface;\n+use Symfony\\Component\\Security\\Csrf\\CsrfTokenManagerInterface;\n+\n+class LoginFormAuthenticatorMockBuilderTest extends \\PHPUnit\\Framework\\TestCase\n+{\n+ function test_get_login_url()\n+ {\n+ $router = $this->createMock(RouterInterface::class);\n+ $router->expects($this->once())\n+ ->method('generate')\n+ ->with('bolt_login')\n+ ->willReturn('test_route');\n+\n+ $res = $this->getTestObj(null, $router, null, null)->start($this->createMock(Request::class));\n+ $this->assertEquals('test_route', $res->getTargetUrl());\n+ }\n+\n+ function test_get_user()\n+ {\n+ $userRepository = $this->createConfiguredMock(UserRepository::class, [\n+ 'findOneBy' => $this->createMock(User::class)\n+ ]);\n+ $csrfTokenManager = $this->createConfiguredMock(CsrfTokenManagerInterface::class, [\n+ 'isTokenValid' => true\n+ ]);\n+\n+ $token = ['csrf_token' => null, 'username' => null];\n+\n+ $res = $this->getTestObj($userRepository, null, $csrfTokenManager, null)->getUser($token, $this->createMock(UserProviderInterface::class));\n+ $this->assertInstanceOf(User::class, $res);\n+ }\n+\n+ function test_get_user_throws()\n+ {\n+ $csrfTokenManager = $this->createConfiguredMock(CsrfTokenManagerInterface::class, [\n+ 'isTokenValid' => false\n+ ]);\n+\n+ $this->expectException(InvalidCsrfTokenException::class);\n+ $this->getTestObj(null, null, $csrfTokenManager, null)->getUser(['csrf_token' => null], $this->createMock(UserProviderInterface::class));\n+ }\n+\n+ private function getTestObj(?UserRepository $userRepository, ?RouterInterface $router, ?CsrfTokenManagerInterface $csrfTokenManager, ?UserPasswordEncoderInterface $userPasswordEncoder): LoginFormAuthenticator\n+ {\n+ return new LoginFormAuthenticator(\n+ $userRepository ?? $this->createMock(UserRepository::class),\n+ $router ?? $this->createMock(RouterInterface::class),\n+ $csrfTokenManager ?? $this->createMock(CsrfTokenManagerInterface::class),\n+ $userPasswordEncoder ?? $this->createMock(UserPasswordEncoderInterface::class)\n+ );\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "tests/php/Security/LoginFormAuthenticatorMockeryTest.php",
"diff": "+<?php\n+\n+declare(strict_types=1);\n+\n+namespace Bolt\\Tests\\Security;\n+\n+use Bolt\\Entity\\User;\n+use Bolt\\Repository\\UserRepository;\n+use Bolt\\Security\\LoginFormAuthenticator;\n+use Symfony\\Component\\HttpFoundation\\Request;\n+use Symfony\\Component\\Routing\\RouterInterface;\n+use Symfony\\Component\\Security\\Core\\Encoder\\UserPasswordEncoderInterface;\n+use Symfony\\Component\\Security\\Core\\Exception\\InvalidCsrfTokenException;\n+use Symfony\\Component\\Security\\Core\\User\\UserProviderInterface;\n+use Symfony\\Component\\Security\\Csrf\\CsrfTokenManagerInterface;\n+\n+class LoginFormAuthenticatorMockeryTest extends \\PHPUnit\\Framework\\TestCase\n+{\n+ public function tearDown() {\n+ \\Mockery::close();\n+ }\n+\n+ function test_get_login_url()\n+ {\n+ $router = \\Mockery::mock(RouterInterface::class);\n+ $router->shouldReceive('generate')\n+ ->with('bolt_login')\n+ ->once()\n+ ->andReturn('test_route');\n+\n+ $res = $this->getTestObj(null, $router, null, null)->start(\\Mockery::mock(Request::class));\n+ $this->assertEquals('test_route', $res->getTargetUrl());\n+ }\n+\n+ function test_get_user()\n+ {\n+ $userRepository = \\Mockery::mock(UserRepository::class);\n+ $userRepository->shouldReceive('findOneBy')\n+ ->andReturn(\\Mockery::mock(User::class));\n+ $csrfTokenManager = \\Mockery::mock(CsrfTokenManagerInterface::class);\n+ $csrfTokenManager->shouldReceive('isTokenValid')\n+ ->andReturn(true);\n+\n+ $token = ['csrf_token' => null, 'username' => null];\n+\n+ $res = $this->getTestObj($userRepository, null, $csrfTokenManager, null)->getUser($token, \\Mockery::mock(UserProviderInterface::class));\n+ $this->assertInstanceOf(User::class, $res);\n+ }\n+\n+ function test_get_user_throws()\n+ {\n+ $csrfTokenManager = \\Mockery::mock(CsrfTokenManagerInterface::class);\n+ $csrfTokenManager->shouldReceive('isTokenValid')\n+ ->andReturn(false);\n+\n+ $this->expectException(InvalidCsrfTokenException::class);\n+ $this->getTestObj(null, null, $csrfTokenManager, null)->getUser(['csrf_token' => null], \\Mockery::mock(UserProviderInterface::class));\n+ }\n+\n+ private function getTestObj(?UserRepository $userRepository, ?RouterInterface $router, ?CsrfTokenManagerInterface $csrfTokenManager, ?UserPasswordEncoderInterface $userPasswordEncoder): LoginFormAuthenticator\n+ {\n+ return new LoginFormAuthenticator(\n+ $userRepository ?? \\Mockery::mock(UserRepository::class),\n+ $router ?? \\Mockery::mock(RouterInterface::class),\n+ $csrfTokenManager ?? \\Mockery::mock(CsrfTokenManagerInterface::class),\n+ $userPasswordEncoder ?? \\Mockery::mock(UserPasswordEncoderInterface::class)\n+ );\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "tests/php/Security/LoginFormAuthenticatorProphecyTest.php",
"diff": "+<?php\n+\n+declare(strict_types=1);\n+\n+namespace Bolt\\Tests\\Security;\n+\n+use Bolt\\Entity\\User;\n+use Bolt\\Repository\\UserRepository;\n+use Bolt\\Security\\LoginFormAuthenticator;\n+use Prophecy\\Argument;\n+use Symfony\\Component\\HttpFoundation\\Request;\n+use Symfony\\Component\\Routing\\RouterInterface;\n+use Symfony\\Component\\Security\\Core\\Encoder\\UserPasswordEncoderInterface;\n+use Symfony\\Component\\Security\\Core\\Exception\\InvalidCsrfTokenException;\n+use Symfony\\Component\\Security\\Core\\User\\UserProviderInterface;\n+use Symfony\\Component\\Security\\Csrf\\CsrfTokenManagerInterface;\n+\n+class LoginFormAuthenticatorProphecyTest extends \\PHPUnit\\Framework\\TestCase\n+{\n+ function test_get_login_url()\n+ {\n+ $router = $this->prophesize(RouterInterface::class);\n+ $router->generate(Argument::type('string'))->shouldBeCalledOnce()->willReturn('test_route');\n+\n+ $res = $this->getTestObj(null, $router, null, null)->start($this->prophesize(Request::class));\n+ $this->assertEquals('test_route', $res->getTargetUrl());\n+ }\n+\n+ function test_get_user()\n+ {\n+ $userRepository = $this->prophesize(UserRepository::class);\n+ $userRepository->findOneBy(['username' => 'test'])->shouldBeCalledOnce()->wilLReturn($this->prophesize(User::class));\n+ $csrfTokenManager = $this->prophesize(CsrfTokenManagerInterface::class);\n+ $csrfTokenManager->isTokenValid()->willReturn(true);\n+\n+ $token = ['csrf_token' => null, 'username' => null];\n+\n+ $res = $this->getTestObj($userRepository, null, $csrfTokenManager, null)->getUser($token, $this->prophesize(UserProviderInterface::class));\n+ $this->assertInstanceOf(User::class, $res);\n+ }\n+\n+ function test_get_user_throws()\n+ {\n+ $csrfTokenManager = $this->prophesize(CsrfTokenManagerInterface::class);\n+ $csrfTokenManager->isTokenValid()->willReturn(false);\n+\n+ $this->expectException(InvalidCsrfTokenException::class);\n+ $this->getTestObj(null, null, $csrfTokenManager, null)->getUser(['csrf_token' => null], $this->prophesize(UserProviderInterface::class));\n+ }\n+\n+ private function getTestObj(?UserRepository $userRepository, ?RouterInterface $router, ?CsrfTokenManagerInterface $csrfTokenManager, ?UserPasswordEncoderInterface $userPasswordEncoder): LoginFormAuthenticator\n+ {\n+ return new LoginFormAuthenticator(\n+ $userRepository ?? $this->prophesize(UserRepository::class)->reveal(),\n+ $router ?? $this->prophesize(RouterInterface::class)->reveal(),\n+ $csrfTokenManager ?? $this->prophesize(CsrfTokenManagerInterface::class)->reveal(),\n+ $userPasswordEncoder ?? $this->prophesize(UserPasswordEncoderInterface::class)->reveal()\n+ );\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "tests/spec/Bolt/Security/LoginFormAuthenticatorSpec.php",
"diff": "+<?php\n+\n+namespace spec\\Bolt\\Security;\n+\n+use Bolt\\Entity\\User;\n+use Bolt\\Repository\\UserRepository;\n+use Bolt\\Security\\LoginFormAuthenticator;\n+use PhpSpec\\ObjectBehavior;\n+use Prophecy\\Argument;\n+use Symfony\\Component\\HttpFoundation\\Request;\n+use Symfony\\Component\\Routing\\RouterInterface;\n+use Symfony\\Component\\Security\\Core\\Encoder\\UserPasswordEncoderInterface;\n+use Symfony\\Component\\Security\\Core\\Exception\\InvalidCsrfTokenException;\n+use Symfony\\Component\\Security\\Core\\User\\UserProviderInterface;\n+use Symfony\\Component\\Security\\Csrf\\CsrfToken;\n+use Symfony\\Component\\Security\\Csrf\\CsrfTokenManagerInterface;\n+\n+/**\n+ * @mixin LoginFormAuthenticator\n+ */\n+class LoginFormAuthenticatorSpec extends ObjectBehavior\n+{\n+ const TEST_TOKEN = ['csrf_token' => null, 'username' => null];\n+\n+ function let(UserRepository $userRepository, RouterInterface $router, CsrfTokenManagerInterface $csrfTokenManager, UserPasswordEncoderInterface $userPasswordEncoder)\n+ {\n+ $this->beConstructedWith($userRepository, $router, $csrfTokenManager, $userPasswordEncoder);\n+ }\n+\n+ function it_gets_login_url(RouterInterface $router, Request $request)\n+ {\n+ $router->generate(Argument::type('string'))->shouldBeCalledOnce()->willReturn('test_route');\n+ $res = $this->start($request);\n+ $res->getTargetUrl()->shouldBe('test_route');\n+ }\n+\n+ function it_gets_user(CsrfTokenManagerInterface $csrfTokenManager, UserProviderInterface $userProvider, UserRepository $userRepository, User $user)\n+ {\n+ $userRepository->findOneBy(['username' => null])->shouldBeCalledOnce()->wilLReturn($user);\n+ $csrfTokenManager->isTokenValid(Argument::type(CsrfToken::class))->willReturn(true);\n+ $this->getUser(self::TEST_TOKEN , $userProvider)->shouldBeAnInstanceOf(User::class);\n+ }\n+\n+ function it_throws_while_getting_user(CsrfTokenManagerInterface $csrfTokenManager, UserProviderInterface $userProvider)\n+ {\n+ $csrfTokenManager->isTokenValid(Argument::any())->willReturn(false);\n+\n+ $this->shouldThrow(InvalidCsrfTokenException::class)->during(\n+ 'getUser',\n+ [\n+ self::TEST_TOKEN,\n+ $userProvider\n+ ]\n+ );\n+ }\n+}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Examples how to write Unit tests with 4 different ways
|
95,112 |
09.01.2019 13:18:32
| -3,600 |
37b437162628ff9cc04728802cb3a97143b01c3c
|
remove mockery
|
[
{
"change_type": "MODIFY",
"old_path": ".travis.yml",
"new_path": ".travis.yml",
"diff": "@@ -26,8 +26,9 @@ install:\n- npm install\nscript:\n- # run PHP Unit tests\n+ # run PHP Unit / PHP Spec tests\n- ./vendor/bin/phpunit\n+ - ./vendor/bin/phpspec run\n# this checks that the source code follows the Bolt Code Syntax rules\n- ./vendor/bin/ecs check src\n- ./vendor/bin/phpstan analyse -c phpstan.neon src\n"
},
{
"change_type": "MODIFY",
"old_path": "composer.json",
"new_path": "composer.json",
"diff": "\"ext-pdo_sqlite\": \"*\",\n\"dama/doctrine-test-bundle\": \"^5.0\",\n\"doctrine/doctrine-fixtures-bundle\": \"^3.0\",\n- \"mockery/mockery\": \"^1.2\",\n\"phpspec/phpspec\": \"^5.1\",\n- \"phpspec/prophecy\": \"^1.8\",\n\"phpstan/phpstan\": \"^0.10.3\",\n\"phpunit/phpunit\": \"^7.0\",\n\"symfony/browser-kit\": \"^4.2\",\n},\n\"autoload-dev\": {\n\"psr-4\": {\n- \"Bolt\\\\Tests\\\\\": \"tests/php/\"\n+ \"Bolt\\\\Tests\\\\\": \"tests/php/\",\n+ \"spec\\\\Bolt\\\\\": \"tests/spec/Bolt/\"\n}\n},\n\"scripts\": {\n"
},
{
"change_type": "MODIFY",
"old_path": "symfony.lock",
"new_path": "symfony.lock",
"diff": "\"guzzlehttp/psr7\": {\n\"version\": \"1.4.2\"\n},\n- \"hamcrest/hamcrest-php\": {\n- \"version\": \"v2.0.0\"\n- },\n\"intervention/image\": {\n\"version\": \"2.4.2\"\n},\n\"miljar/php-exif\": {\n\"version\": \"v0.6.4\"\n},\n- \"mockery/mockery\": {\n- \"version\": \"1.2.0\"\n- },\n\"monolog/monolog\": {\n\"version\": \"1.23.0\"\n},\n"
},
{
"change_type": "DELETE",
"old_path": "tests/php/Security/LoginFormAuthenticatorMockeryTest.php",
"new_path": null,
"diff": "-<?php\n-\n-declare(strict_types=1);\n-\n-namespace Bolt\\Tests\\Security;\n-\n-use Bolt\\Entity\\User;\n-use Bolt\\Repository\\UserRepository;\n-use Bolt\\Security\\LoginFormAuthenticator;\n-use Symfony\\Component\\HttpFoundation\\Request;\n-use Symfony\\Component\\Routing\\RouterInterface;\n-use Symfony\\Component\\Security\\Core\\Encoder\\UserPasswordEncoderInterface;\n-use Symfony\\Component\\Security\\Core\\Exception\\InvalidCsrfTokenException;\n-use Symfony\\Component\\Security\\Core\\User\\UserProviderInterface;\n-use Symfony\\Component\\Security\\Csrf\\CsrfTokenManagerInterface;\n-\n-class LoginFormAuthenticatorMockeryTest extends \\PHPUnit\\Framework\\TestCase\n-{\n- const TEST_TOKEN = ['csrf_token' => null, 'username' => null];\n-\n- public function tearDown() {\n- \\Mockery::close();\n- }\n-\n- function test_get_login_url()\n- {\n- $router = \\Mockery::mock(RouterInterface::class);\n- $router->shouldReceive('generate')\n- ->with('bolt_login')\n- ->once()\n- ->andReturn('test_route');\n-\n- $res = $this->getTestObj(null, $router, null, null)->start(\\Mockery::mock(Request::class));\n- $this->assertEquals('test_route', $res->getTargetUrl());\n- }\n-\n- function test_get_user()\n- {\n- $userRepository = \\Mockery::mock(UserRepository::class);\n- $userRepository->shouldReceive('findOneBy')\n- ->andReturn(\\Mockery::mock(User::class));\n- $csrfTokenManager = \\Mockery::mock(CsrfTokenManagerInterface::class);\n- $csrfTokenManager->shouldReceive('isTokenValid')\n- ->andReturn(true);\n-\n- $res = $this->getTestObj($userRepository, null, $csrfTokenManager, null)->getUser(self::TEST_TOKEN, \\Mockery::mock(UserProviderInterface::class));\n- $this->assertInstanceOf(User::class, $res);\n- }\n-\n- function test_get_user_throws()\n- {\n- $csrfTokenManager = \\Mockery::mock(CsrfTokenManagerInterface::class);\n- $csrfTokenManager->shouldReceive('isTokenValid')\n- ->andReturn(false);\n-\n- $this->expectException(InvalidCsrfTokenException::class);\n- $this->getTestObj(null, null, $csrfTokenManager, null)->getUser(self::TEST_TOKEN, \\Mockery::mock(UserProviderInterface::class));\n- }\n-\n- private function getTestObj(?UserRepository $userRepository, ?RouterInterface $router, ?CsrfTokenManagerInterface $csrfTokenManager, ?UserPasswordEncoderInterface $userPasswordEncoder): LoginFormAuthenticator\n- {\n- return new LoginFormAuthenticator(\n- $userRepository ?? \\Mockery::mock(UserRepository::class),\n- $router ?? \\Mockery::mock(RouterInterface::class),\n- $csrfTokenManager ?? \\Mockery::mock(CsrfTokenManagerInterface::class),\n- $userPasswordEncoder ?? \\Mockery::mock(UserPasswordEncoderInterface::class)\n- );\n- }\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "tests/php/Security/LoginFormAuthenticatorProphecyTest.php",
"new_path": null,
"diff": "-<?php\n-\n-declare(strict_types=1);\n-\n-namespace Bolt\\Tests\\Security;\n-\n-use Bolt\\Entity\\User;\n-use Bolt\\Repository\\UserRepository;\n-use Bolt\\Security\\LoginFormAuthenticator;\n-use Prophecy\\Argument;\n-use Symfony\\Component\\HttpFoundation\\Request;\n-use Symfony\\Component\\Routing\\RouterInterface;\n-use Symfony\\Component\\Security\\Core\\Encoder\\UserPasswordEncoderInterface;\n-use Symfony\\Component\\Security\\Core\\Exception\\InvalidCsrfTokenException;\n-use Symfony\\Component\\Security\\Core\\User\\UserProviderInterface;\n-use Symfony\\Component\\Security\\Csrf\\CsrfToken;\n-use Symfony\\Component\\Security\\Csrf\\CsrfTokenManagerInterface;\n-\n-class LoginFormAuthenticatorProphecyTest extends \\PHPUnit\\Framework\\TestCase\n-{\n- const TEST_TOKEN = ['csrf_token' => null, 'username' => null];\n-\n- function test_get_login_url()\n- {\n- $router = $this->prophesize(RouterInterface::class);\n- $router->generate(Argument::type('string'))->shouldBeCalledOnce()->willReturn('test_route');\n-\n- $res = $this->getTestObj(null, $router->reveal(), null, null)->start($this->prophesize(Request::class)->reveal());\n- $this->assertEquals('test_route', $res->getTargetUrl());\n- }\n-\n- function test_get_user()\n- {\n- $userRepository = $this->prophesize(UserRepository::class);\n- $userRepository->findOneBy(['username' => null])->shouldBeCalledOnce()->wilLReturn($this->prophesize(User::class));\n- $csrfTokenManager = $this->prophesize(CsrfTokenManagerInterface::class);\n- $csrfTokenManager->isTokenValid(Argument::type(CsrfToken::class))->willReturn(true);\n-\n- $res = $this->getTestObj($userRepository->reveal(), null, $csrfTokenManager->reveal(), null)->getUser(self::TEST_TOKEN, $this->prophesize(UserProviderInterface::class)->reveal());\n- $this->assertInstanceOf(User::class, $res);\n- }\n-\n- function test_get_user_throws()\n- {\n- $csrfTokenManager = $this->prophesize(CsrfTokenManagerInterface::class);\n- $csrfTokenManager->isTokenValid(Argument::any())->willReturn(false);\n-\n- $this->expectException(InvalidCsrfTokenException::class);\n- $this->getTestObj(null, null, $csrfTokenManager->reveal(), null)->getUser(self::TEST_TOKEN, $this->prophesize(UserProviderInterface::class)->reveal());\n- }\n-\n- private function getTestObj(?UserRepository $userRepository, ?RouterInterface $router, ?CsrfTokenManagerInterface $csrfTokenManager, ?UserPasswordEncoderInterface $userPasswordEncoder): LoginFormAuthenticator\n- {\n- return new LoginFormAuthenticator(\n- $userRepository ?? $this->prophesize(UserRepository::class)->reveal(),\n- $router ?? $this->prophesize(RouterInterface::class)->reveal(),\n- $csrfTokenManager ?? $this->prophesize(CsrfTokenManagerInterface::class)->reveal(),\n- $userPasswordEncoder ?? $this->prophesize(UserPasswordEncoderInterface::class)->reveal()\n- );\n- }\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "RENAME",
"old_path": "tests/php/Security/LoginFormAuthenticatorMockBuilderTest.php",
"new_path": "tests/php/Security/LoginFormAuthenticatorTest.php",
"diff": "@@ -7,6 +7,7 @@ namespace Bolt\\Tests\\Security;\nuse Bolt\\Entity\\User;\nuse Bolt\\Repository\\UserRepository;\nuse Bolt\\Security\\LoginFormAuthenticator;\n+use PHPUnit\\Framework\\TestCase;\nuse Symfony\\Component\\HttpFoundation\\Request;\nuse Symfony\\Component\\Routing\\RouterInterface;\nuse Symfony\\Component\\Security\\Core\\Encoder\\UserPasswordEncoderInterface;\n@@ -14,7 +15,7 @@ use Symfony\\Component\\Security\\Core\\Exception\\InvalidCsrfTokenException;\nuse Symfony\\Component\\Security\\Core\\User\\UserProviderInterface;\nuse Symfony\\Component\\Security\\Csrf\\CsrfTokenManagerInterface;\n-class LoginFormAuthenticatorMockBuilderTest extends \\PHPUnit\\Framework\\TestCase\n+class LoginFormAuthenticatorTest extends TestCase\n{\nconst TEST_TOKEN = ['csrf_token' => null, 'username' => null];\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
remove mockery
|
95,144 |
10.01.2019 15:53:44
| -3,600 |
79fcf38e2b1b67cc6a13661f3139fdd7de052458
|
Hotfix: don't add `/bolt` to security.yaml yet. See
|
[
{
"change_type": "MODIFY",
"old_path": "config/packages/security.yaml",
"new_path": "config/packages/security.yaml",
"diff": "@@ -33,5 +33,5 @@ security:\n# this is a catch-all for the admin area\n# additional security lives in the controllers\n# @todo make admin area prefix configurable\n- - { path: '^/bolt', roles: ROLE_ADMIN }\n+ # - { path: '^/bolt', roles: ROLE_ADMIN }\n- { path: '^/(%app_locales%)/bolt', roles: ROLE_ADMIN }\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Hotfix: don't add `/bolt` to security.yaml yet. See #245
|
95,144 |
10.01.2019 18:21:22
| -3,600 |
829eb9c43ff8ea5acb041c96cc099dfc51a5f618
|
Fix Vue multiselect
|
[
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/Editor/Select/Select.vue",
"new_path": "assets/js/app/editor/Components/Editor/Select/Select.vue",
"diff": "@@ -45,9 +45,8 @@ export default {\nconst _options = this.options;\nlet filterSelectedItems = _options.filter(item => {\n- return _values.includes(item.key) || _values == item.key;\n+ return _values.includes(item.key);\n});\n-\nthis.selected = filterSelectedItems;\n},\ndata: () => {\n@@ -58,12 +57,14 @@ export default {\ncomputed: {\nsanitized() {\nlet filtered;\n- if (this.multiple) {\n+\n+ if (this.selected === null) {\n+ return JSON.stringify([]);\n+ } else if (this.selected.map) {\nfiltered = this.selected.map(item => item.key);\nreturn JSON.stringify(filtered);\n} else {\n- filtered = [this.selected];\n- return JSON.stringify(filtered[0].key);\n+ return JSON.stringify([this.selected.key]);\n}\n},\nfieldName() {\n"
},
{
"change_type": "MODIFY",
"old_path": "config/bolt/contenttypes.yaml",
"new_path": "config/bolt/contenttypes.yaml",
"diff": "@@ -337,11 +337,11 @@ dummies:\nfoo: Foooo\nbar: Bario\nbaz: BAzzazza\n-# multiselect:\n-# type: select\n-# values: [ A-tuin, Donatello, Rafael, Leonardo, Michelangelo, Koopa, Squirtle ]\n-# multiple: true\n-# postfix: \"Select your favourite turtle(s).\"\n+ multiselect:\n+ type: select\n+ values: [ A-tuin, Donatello, Rafael, Leonardo, Michelangelo, Koopa, Squirtle ]\n+ multiple: true\n+ postfix: \"Select your favourite turtle(s).\"\ntaxonomy: [ groups, categories, tags, foobars ]\n# Possible field types:\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Entity/Field/SelectField.php",
"new_path": "src/Entity/Field/SelectField.php",
"diff": "@@ -18,7 +18,7 @@ class SelectField extends Field\npublic function getValue(): ?array\n{\nif (empty($this->value)) {\n- $this->value = [key($this->getDefinition()->get('values'))];\n+ $this->value = [];\n}\nreturn $this->value;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/select.html.twig",
"new_path": "templates/_partials/fields/select.html.twig",
"diff": "{% block field %}\n{#<pre><code>{{ value|json_encode() }}</code></pre>#}\n<editor-select\n- :value=\"'{{ value|json_encode() }}'\"\n+ :value=\"{{ value|json_encode() }}\"\n:name=\"'{{ name }}'\"\n:id=\"'{{ id }}'\"\n:options=\"{{ options|json_encode() }}\"\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/content/_fields_aside.html.twig",
"new_path": "templates/content/_fields_aside.html.twig",
"diff": "{% include '@bolt/_partials/fields/select.html.twig' with {\n'label' : 'field.status' | trans,\n'name' : 'status',\n- 'value' : record.status,\n+ 'value' : [record.status],\n'options' : record.statusoptions,\n'form' : 'editcontent'\n} %}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Fix Vue multiselect
|
95,144 |
11.01.2019 12:29:17
| -3,600 |
521f528ec6d5d4b736049bc9305eab5f1c5a28ab
|
Refactor `fullName` to `displayName` for Users / Authors
|
[
{
"change_type": "MODIFY",
"old_path": "src/Command/AddUserCommand.php",
"new_path": "src/Command/AddUserCommand.php",
"diff": "@@ -146,12 +146,12 @@ class AddUserCommand extends Command\n}\n// Ask for the full name if it's not defined\n- $fullName = $input->getArgument('full-name');\n- if ($fullName !== null) {\n- $this->io->text(' > <info>Full Name</info>: ' . $fullName);\n+ $displayName = $input->getArgument('display-name');\n+ if ($displayName !== null) {\n+ $this->io->text(' > <info>Full Name</info>: ' . $displayName);\n} else {\n- $fullName = $this->io->ask('Full Name', null, [$this->validator, 'validateFullName']);\n- $input->setArgument('full-name', $fullName);\n+ $displayName = $this->io->ask('Full Name', null, [$this->validator, 'validateDisplayName']);\n+ $input->setArgument('display-name', $displayName);\n}\n}\n@@ -167,15 +167,15 @@ class AddUserCommand extends Command\n$username = $input->getArgument('username');\n$plainPassword = $input->getArgument('password');\n$email = $input->getArgument('email');\n- $fullName = $input->getArgument('full-name');\n+ $displayName = $input->getArgument('display-name');\n$isAdmin = $input->getOption('admin');\n// make sure to validate the user data is correct\n- $this->validateUserData($username, $plainPassword, $email, $fullName);\n+ $this->validateUserData($username, $plainPassword, $email, $displayName);\n// create the user and encode its password\n$user = new User();\n- $user->setFullName($fullName);\n+ $user->setDisplayName($displayName);\n$user->setUsername($username);\n$user->setEmail($email);\n$user->setRoles([$isAdmin ? 'ROLE_ADMIN' : 'ROLE_USER']);\n@@ -195,7 +195,7 @@ class AddUserCommand extends Command\n}\n}\n- private function validateUserData($username, $plainPassword, $email, $fullName): void\n+ private function validateUserData($username, $plainPassword, $email, $displayName): void\n{\n// first check if a user with the same username already exists.\n$existingUser = $this->users->findOneBy(['username' => $username]);\n@@ -207,7 +207,7 @@ class AddUserCommand extends Command\n// validate password and email if is not this input means interactive.\n$this->validator->validatePassword($plainPassword);\n$this->validator->validateEmail($email);\n- $this->validator->validateFullName($fullName);\n+ $this->validator->validateDisplayName($displayName);\n// check if a user with the same email already exists.\n$existingEmail = $this->users->findOneBy(['email' => $email]);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Command/ListUsersCommand.php",
"new_path": "src/Command/ListUsersCommand.php",
"diff": "@@ -90,7 +90,7 @@ HELP\n$usersAsPlainArrays = array_map(function (User $user) {\nreturn [\n$user->getId(),\n- $user->getFullName(),\n+ $user->getDisplayName(),\n$user->getUsername(),\n$user->getEmail(),\nimplode(', ', $user->getRoles()),\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/ProfileController.php",
"new_path": "src/Controller/Backend/ProfileController.php",
"diff": "@@ -33,7 +33,7 @@ class ProfileController extends BaseController\n$user = $this->getUser();\nreturn $this->renderTemplate('users/edit.html.twig', [\n- 'usertitle' => $user->getFullName(),\n+ 'usertitle' => $user->getDisplayName(),\n'user' => $user,\n]);\n}\n@@ -48,12 +48,12 @@ class ProfileController extends BaseController\npublic function profileEditPost(Request $request, UrlGeneratorInterface $urlGenerator, ObjectManager $manager, UserPasswordEncoderInterface $encoder): Response\n{\n$user = $this->getUser();\n- $userTitle = $user->getFullName();\n+ $userTitle = $user->getDisplayName();\n$url = $urlGenerator->generate('bolt_profile_edit');\n$locale = current($request->get('locale'));\n$newPassword = $request->get('password');\n- $user->setFullName($request->get('fullName'));\n+ $user->setDisplayName($request->get('displayName'));\n$user->setEmail($request->get('email'));\n$user->setLocale($locale);\n$user->setbackendTheme($request->get('user')['backendTheme']);\n@@ -67,7 +67,7 @@ class ProfileController extends BaseController\n];\n// Validate username\n- if (! filter_var(mb_strlen($user->getFullName()), FILTER_VALIDATE_INT, $usernameValidateOptions)) {\n+ if (! filter_var(mb_strlen($user->getDisplayName()), FILTER_VALIDATE_INT, $usernameValidateOptions)) {\n$this->addFlash('danger', 'user.not_valid_username');\n$hasError = true;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/DataFixtures/UserFixtures.php",
"new_path": "src/DataFixtures/UserFixtures.php",
"diff": "@@ -28,9 +28,9 @@ class UserFixtures extends Fixture\nprivate function loadUsers(ObjectManager $manager): void\n{\n- foreach ($this->getUserData() as [$fullname, $username, $password, $email, $roles]) {\n+ foreach ($this->getUserData() as [$displayname, $username, $password, $email, $roles]) {\n$user = new User();\n- $user->setFullName($fullname);\n+ $user->setDisplayName($displayname);\n$user->setUsername($username);\n$user->setPassword($this->passwordEncoder->encodePassword($user, $password));\n$user->setEmail($email);\n@@ -48,7 +48,7 @@ class UserFixtures extends Fixture\nprivate function getUserData(): array\n{\nreturn [\n- // $userData = [$fullname, $username, $password, $email, $roles];\n+ // $userData = [$displayname, $username, $password, $email, $roles];\n['Admin', 'admin', 'admin%1', 'admin@example.org', ['ROLE_ADMIN']],\n['Gekke Henkie', 'henkie', 'henkie%1', 'henkie@example.org', ['ROLE_EDITOR']],\n['Jane Doe', 'jane_admin', 'kitten', 'jane_admin@example.org', ['ROLE_ADMIN']],\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Entity/Content.php",
"new_path": "src/Entity/Content.php",
"diff": "@@ -195,7 +195,7 @@ class Content\n'editlink' => $this->magicEditLink(),\n'author' => [\n'id' => $this->getAuthor()->getid(),\n- 'fullName' => $this->getAuthor()->getfullName(),\n+ 'displayName' => $this->getAuthor()->getDisplayName(),\n'username' => $this->getAuthor()->getusername(),\n'email' => $this->getAuthor()->getemail(),\n'roles' => $this->getAuthor()->getroles(),\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Entity/User.php",
"new_path": "src/Entity/User.php",
"diff": "@@ -38,7 +38,7 @@ class User implements UserInterface, \\Serializable\n* @Assert\\NotBlank()\n* @Groups(\"public\")\n*/\n- private $fullName;\n+ private $displayName;\n/**\n* @var string\n@@ -104,19 +104,19 @@ class User implements UserInterface, \\Serializable\nreturn $this->id;\n}\n- public function setFullName(string $fullName): void\n+ public function setDisplayName(string $displayName): void\n{\n- $this->fullName = $fullName;\n+ $this->displayName = $displayName;\n}\n- public function getFullName(): string\n+ public function getDisplayName(): string\n{\n- return $this->fullName;\n+ return $this->displayName;\n}\npublic function __toString()\n{\n- return $this->getFullName();\n+ return $this->getdisplayName();\n}\npublic function getUsername(): string\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Form/UserType.php",
"new_path": "src/Form/UserType.php",
"diff": "@@ -33,8 +33,8 @@ class UserType extends AbstractType\n'label' => 'label.username',\n'disabled' => true,\n])\n- ->add('fullName', TextType::class, [\n- 'label' => 'label.fullname',\n+ ->add('displayName', TextType::class, [\n+ 'label' => 'label.displayname',\n])\n->add('email', EmailType::class, [\n'label' => 'label.email',\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Utils/Validator.php",
"new_path": "src/Utils/Validator.php",
"diff": "@@ -53,12 +53,12 @@ class Validator\nreturn $email;\n}\n- public function validateFullName(?string $fullName): string\n+ public function validateDisplayName(?string $displayName): string\n{\n- if (empty($fullName)) {\n- throw new InvalidArgumentException('The full name can not be empty.');\n+ if (empty($displayName)) {\n+ throw new InvalidArgumentException('The display name can not be empty.');\n}\n- return $fullName;\n+ return $displayName;\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_base/layout.html.twig",
"new_path": "templates/_base/layout.html.twig",
"diff": "<!-- Admin Toolbar -->\n<nav id=\"toolbar\" class=\"admin__toolbar\">\n- {% set username = user.fullName|default('Unknown user') %}\n+ {% set username = user.displayName|default('Unknown user') %}\n{% set labels = jsonlabels(['about.bolt_documentation', 'action.visit_site', 'action.create_new', ['general.greeting', {'%name%': username}], 'action.logout', 'action.edit_profile']) %}\n<admin-toolbar\nsite-name=\"{% if config is defined %}{{ config.get('general/sitename') }}{% endif %}\"\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/content/_fields_aside.html.twig",
"new_path": "templates/content/_fields_aside.html.twig",
"diff": "{% include '@bolt/_partials/fields/text.html.twig' with {\n'label' : 'field.author' | trans,\n'name' : 'author',\n- 'value' : record.author.fullName,\n+ 'value' : record.author.displayName,\n'disabled' : true\n} %}\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/users/edit.html.twig",
"new_path": "templates/users/edit.html.twig",
"diff": "} %}\n{% include '@bolt/_partials/fields/text.html.twig' with {\n- 'label' : 'label.fullname' | trans,\n- 'name' : 'fullName',\n- 'value' : user.fullName,\n+ 'label' : 'label.displayname' | trans,\n+ 'name' : 'displayName',\n+ 'value' : user.displayName,\n'disabled' : false,\n} %}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Refactor `fullName` to `displayName` for Users / Authors
|
95,144 |
11.01.2019 13:28:57
| -3,600 |
c16d5ac4f3b1b29f31d48cf602b2417d1dadf6dd
|
Fixes, as suggested.
|
[
{
"change_type": "MODIFY",
"old_path": "src/Command/AddUserCommand.php",
"new_path": "src/Command/AddUserCommand.php",
"diff": "@@ -76,7 +76,7 @@ class AddUserCommand extends Command\n->addArgument('username', InputArgument::OPTIONAL, 'The username of the new user')\n->addArgument('password', InputArgument::OPTIONAL, 'The plain password of the new user')\n->addArgument('email', InputArgument::OPTIONAL, 'The email of the new user')\n- ->addArgument('full-name', InputArgument::OPTIONAL, 'The full name of the new user')\n+ ->addArgument('display-name', InputArgument::OPTIONAL, 'The display name of the new user')\n->addOption('admin', null, InputOption::VALUE_NONE, 'If set, the user is created as an administrator');\n}\n@@ -148,7 +148,7 @@ class AddUserCommand extends Command\n// Ask for the full name if it's not defined\n$displayName = $input->getArgument('display-name');\nif ($displayName !== null) {\n- $this->io->text(' > <info>Full Name</info>: ' . $displayName);\n+ $this->io->text(' > <info>Display Name</info>: ' . $displayName);\n} else {\n$displayName = $this->io->ask('Full Name', null, [$this->validator, 'validateDisplayName']);\n$input->setArgument('display-name', $displayName);\n@@ -195,7 +195,7 @@ class AddUserCommand extends Command\n}\n}\n- private function validateUserData($username, $plainPassword, $email, $displayName): void\n+ private function validateUserData(string $username, string $plainPassword, string $email, string $displayName): void\n{\n// first check if a user with the same username already exists.\n$existingUser = $this->users->findOneBy(['username' => $username]);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/ProfileController.php",
"new_path": "src/Controller/Backend/ProfileController.php",
"diff": "@@ -48,7 +48,7 @@ class ProfileController extends BaseController\npublic function profileEditPost(Request $request, UrlGeneratorInterface $urlGenerator, ObjectManager $manager, UserPasswordEncoderInterface $encoder): Response\n{\n$user = $this->getUser();\n- $userTitle = $user->getDisplayName();\n+ $displayName = $user->getDisplayName();\n$url = $urlGenerator->generate('bolt_profile_edit');\n$locale = current($request->get('locale'));\n$newPassword = $request->get('password');\n@@ -88,7 +88,7 @@ class ProfileController extends BaseController\nif ($hasError) {\nreturn $this->renderTemplate('users/edit.html.twig', [\n- 'usertitle' => $userTitle,\n+ 'usertitle' => $displayName,\n'user' => $user,\n]);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/DataFixtures/UserFixtures.php",
"new_path": "src/DataFixtures/UserFixtures.php",
"diff": "@@ -28,18 +28,18 @@ class UserFixtures extends Fixture\nprivate function loadUsers(ObjectManager $manager): void\n{\n- foreach ($this->getUserData() as [$displayname, $username, $password, $email, $roles]) {\n+ foreach ($this->getUserData() as $userData) {\n$user = new User();\n- $user->setDisplayName($displayname);\n- $user->setUsername($username);\n- $user->setPassword($this->passwordEncoder->encodePassword($user, $password));\n- $user->setEmail($email);\n- $user->setRoles($roles);\n+ $user->setDisplayName($userData['displayname']);\n+ $user->setUsername($userData['username']);\n+ $user->setPassword($this->passwordEncoder->encodePassword($user, $userData['password']));\n+ $user->setEmail($userData['email']);\n+ $user->setRoles($userData['roles']);\n$user->setLocale('en');\n$user->setBackendTheme('default');\n$manager->persist($user);\n- $this->addReference($username, $user);\n+ $this->addReference($userData['username'], $user);\n}\n$manager->flush();\n@@ -48,12 +48,41 @@ class UserFixtures extends Fixture\nprivate function getUserData(): array\n{\nreturn [\n- // $userData = [$displayname, $username, $password, $email, $roles];\n- ['Admin', 'admin', 'admin%1', 'admin@example.org', ['ROLE_ADMIN']],\n- ['Gekke Henkie', 'henkie', 'henkie%1', 'henkie@example.org', ['ROLE_EDITOR']],\n- ['Jane Doe', 'jane_admin', 'kitten', 'jane_admin@example.org', ['ROLE_ADMIN']],\n- ['Tom Doe', 'tom_admin', 'kitten', 'tom_admin@example.org', ['ROLE_ADMIN']],\n- ['John Doe', 'john_user', 'kitten', 'john_user@example.org', ['ROLE_USER']],\n+ [\n+ 'displayname' => 'Admin',\n+ 'username' => 'admin',\n+ 'password' => 'admin%1',\n+ 'email' => 'admin@example.org',\n+ 'roles' => ['ROLE_ADMIN'],\n+ ],\n+ [\n+ 'displayname' => 'Gekke Henkie',\n+ 'username' => 'henkie',\n+ 'password' => 'henkie%1',\n+ 'email' => 'henkie@example.org',\n+ 'roles' => ['ROLE_EDITOR'],\n+ ],\n+ [\n+ 'displayname' => 'Jane Doe',\n+ 'username' => 'jane_admin',\n+ 'password' => 'kitten',\n+ 'email' => 'jane_admin@example.org',\n+ 'roles' => ['ROLE_ADMIN'],\n+ ],\n+ [\n+ 'displayname' => 'Tom Doe',\n+ 'username' => 'tom_admin',\n+ 'password' => 'kitten',\n+ 'email' => 'tom_admin@example.org',\n+ 'roles' => ['ROLE_ADMIN'],\n+ ],\n+ [\n+ 'displayname' => 'John Doe',\n+ 'username' => 'john_user',\n+ 'password' => 'kitten',\n+ 'email' => 'john_user@example.org',\n+ 'roles' => ['ROLE_USER'],\n+ ],\n];\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_base/layout.html.twig",
"new_path": "templates/_base/layout.html.twig",
"diff": "<!-- Admin Toolbar -->\n<nav id=\"toolbar\" class=\"admin__toolbar\">\n- {% set username = user.displayName|default('Unknown user') %}\n- {% set labels = jsonlabels(['about.bolt_documentation', 'action.visit_site', 'action.create_new', ['general.greeting', {'%name%': username}], 'action.logout', 'action.edit_profile']) %}\n+ {% set user_display_name = user.displayName|default('Unknown user') %}\n+ {% set labels = jsonlabels(['about.bolt_documentation', 'action.visit_site', 'action.create_new', ['general.greeting', {'%name%': user_display_name}], 'action.logout', 'action.edit_profile']) %}\n<admin-toolbar\nsite-name=\"{% if config is defined %}{{ config.get('general/sitename') }}{% endif %}\"\n:menu=\"{{ sidebarmenu() }}\"\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Fixes, as suggested.
|
95,144 |
11.01.2019 13:55:14
| -3,600 |
28f8a2e6c3170b2944a575355bf4e76cd9c53203
|
More requested tweaks
|
[
{
"change_type": "MODIFY",
"old_path": "src/Command/AddUserCommand.php",
"new_path": "src/Command/AddUserCommand.php",
"diff": "@@ -104,7 +104,7 @@ class AddUserCommand extends Command\n*/\nprotected function interact(InputInterface $input, OutputInterface $output): void\n{\n- if ($input->getArgument('username') !== null && $input->getArgument('password') !== null && $input->getArgument('email') !== null && $input->getArgument('full-name') !== null) {\n+ if ($input->getArgument('username') !== null && $input->getArgument('password') !== null && $input->getArgument('email') !== null && $input->getArgument('display-name') !== null) {\nreturn;\n}\n@@ -145,12 +145,12 @@ class AddUserCommand extends Command\n$input->setArgument('email', $email);\n}\n- // Ask for the full name if it's not defined\n+ // Ask for the display name if it's not defined\n$displayName = $input->getArgument('display-name');\nif ($displayName !== null) {\n$this->io->text(' > <info>Display Name</info>: ' . $displayName);\n} else {\n- $displayName = $this->io->ask('Full Name', null, [$this->validator, 'validateDisplayName']);\n+ $displayName = $this->io->ask('Display Name', null, [$this->validator, 'validateDisplayName']);\n$input->setArgument('display-name', $displayName);\n}\n}\n@@ -204,6 +204,8 @@ class AddUserCommand extends Command\nthrow new RuntimeException(sprintf('There is already a user registered with the \"%s\" username.', $username));\n}\n+ // @todo Validation must be moved to a separate UserValidator\n+\n// validate password and email if is not this input means interactive.\n$this->validator->validatePassword($plainPassword);\n$this->validator->validateEmail($email);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/ProfileController.php",
"new_path": "src/Controller/Backend/ProfileController.php",
"diff": "@@ -33,7 +33,7 @@ class ProfileController extends BaseController\n$user = $this->getUser();\nreturn $this->renderTemplate('users/edit.html.twig', [\n- 'usertitle' => $user->getDisplayName(),\n+ 'display_name' => $user->getDisplayName(),\n'user' => $user,\n]);\n}\n@@ -66,6 +66,8 @@ class ProfileController extends BaseController\n],\n];\n+ // @todo Validation must be moved to a separate UserValidator\n+\n// Validate username\nif (! filter_var(mb_strlen($user->getDisplayName()), FILTER_VALIDATE_INT, $usernameValidateOptions)) {\n$this->addFlash('danger', 'user.not_valid_username');\n@@ -88,7 +90,7 @@ class ProfileController extends BaseController\nif ($hasError) {\nreturn $this->renderTemplate('users/edit.html.twig', [\n- 'usertitle' => $displayName,\n+ 'display_name' => $displayName,\n'user' => $user,\n]);\n}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
More requested tweaks
|
95,144 |
11.01.2019 15:54:52
| -3,600 |
aff46fa26b089307a5158ee230f223c68ce98b9e
|
Minor tweaks to CSS
|
[
{
"change_type": "MODIFY",
"old_path": "assets/scss/init/_base.scss",
"new_path": "assets/scss/init/_base.scss",
"diff": "@@ -30,3 +30,4 @@ strong {\n.custom-select{\n-webkit-appearance: none;\n}\n+\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/scss/init/_variables.scss",
"new_path": "assets/scss/init/_variables.scss",
"diff": "//** Init | Variables\n$card-box-shadow: 0 7.5px 15px -5px rgba(0,0,0, 0.07);\n-$letter-spacing: 1.2px;\n+\n+$letter-spacing: 1.0px;\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/scss/layout/_admin.scss",
"new_path": "assets/scss/layout/_admin.scss",
"diff": "@@ -43,7 +43,11 @@ $admin-header-height: 70px;\ndisplay: flex;\ngrid-area: header;\nposition: relative;\n- height: $admin-header-height;\n+ padding: 1.5rem 0 0 0;\n+\n+ .container {\n+ padding: 0;\n+ }\n}\n&__sidebar {\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/scss/modules/admin/_header.scss",
"new_path": "assets/scss/modules/admin/_header.scss",
"diff": "//** Admin | Header\n.admin__header{\n+\n&--title{\nfont-weight: $font-weight-normal;\n- font-size: $h3-font-size;\n+ font-size: $h2-font-size;\ni{\ncolor: var(--primary)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/scss/vendor/bootstrap/_overrides.scss",
"new_path": "assets/scss/vendor/bootstrap/_overrides.scss",
"diff": "//** Bootstrap Overrides\n-// typography\n-$font-family-base: 'Open Sans', sans-serif;\n+// Typography\n+$font-family-base: -apple-system, BlinkMacSystemFont, \"Segoe UI\", Roboto, Helvetica, Arial, sans-serif, \"Apple Color Emoji\", \"Segoe UI Emoji\", \"Segoe UI Symbol\";\n$headings-font-family: 'Source Sans Pro', sans-serif;\n$font-size-base: 0.85rem;\n@@ -12,12 +12,12 @@ $font-weight-semibold: 600;\n$font-weight-bold: 700;\n$headings-font-weight: 600;\n-// links\n+// Links\n$link-color: var(--primary);\n$link-hover-color: var(--primary-600);\n-//form controls\n+// Form controls\n$border-radius: 0.15rem;\n$component-active-bg: var(--primary);\n$input-focus-border-color: var(--primary-400);\n@@ -28,14 +28,16 @@ $input-btn-focus-width: 0.15rem;\n$input-btn-focus-box-shadow: 0 0 0 $input-btn-focus-width var(--primary-200);\n// Cards\n-\n$card-border-width: 0;\n$card-border-radius: $border-radius;\n$card-border-color: transparent;\n$card-bg: var(--foreground);\n-// grid\n+// Buttons\n+$btn-font-weight: 500;\n+\n+// Grid\n$grid-breakpoints: (\nxs: 0,\nsm: 576px,\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/scss/vendor/bootstrap/bootstrap.scss",
"new_path": "assets/scss/vendor/bootstrap/bootstrap.scss",
"diff": "// @import \"~bootstrap/scss/root\";\n@import \"~bootstrap/scss/reboot\";\n+@import \"~bootstrap/scss/type\";\n@import \"~bootstrap/scss/grid\";\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_base/layout.html.twig",
"new_path": "templates/_base/layout.html.twig",
"diff": "<header class=\"admin__header\">\n<div class=\"container\">\n<nav class=\"admin__header--topbar\">\n- <h2 class=\"admin__header--title\">{{ block('title') }}</h2>\n+ <h1 class=\"admin__header--title\">{{ block('title') }}</h1>\n</nav>\n</div>\n</header>\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/pages/placeholder.html.twig",
"new_path": "templates/pages/placeholder.html.twig",
"diff": "<div class=\"row\">\n<div class=\"col-md-9\">\n- <h2>{{ title }}</h2>\n+ <h1>{{ title }}</h1>\n{% if subtitle|default() %}\n<h3>{{ subtitle }}</h3>\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Minor tweaks to CSS
|
95,112 |
11.01.2019 16:26:53
| -3,600 |
12a1dd8a9ddea80383882d365cef76e03eb2844d
|
move UrlGenerator to magic trait
|
[
{
"change_type": "MODIFY",
"old_path": "src/Entity/Content.php",
"new_path": "src/Entity/Content.php",
"diff": "@@ -12,7 +12,6 @@ use Bolt\\Enum\\Statuses;\nuse Doctrine\\Common\\Collections\\ArrayCollection;\nuse Doctrine\\Common\\Collections\\Collection;\nuse Doctrine\\ORM\\Mapping as ORM;\n-use Symfony\\Component\\Routing\\Generator\\UrlGeneratorInterface;\nuse Symfony\\Component\\Serializer\\Annotation\\Groups;\nuse Symfony\\Component\\Serializer\\Annotation\\MaxDepth;\nuse Tightenco\\Collect\\Support\\Collection as LaravelCollection;\n@@ -125,9 +124,6 @@ class Content\n/** @var ?ContentType */\nprivate $contentTypeDefinition;\n- /** @var UrlGeneratorInterface */\n- private $urlGenerator;\n-\n/**\n* Set the \"Magic properties for automagic population in the API.\n*/\n@@ -165,11 +161,6 @@ class Content\n$this->contentTypeDefinition = ContentType::factory($this->contentType, $contentTypesConfig);\n}\n- public function setUrlGenerator(UrlGeneratorInterface $urlGenerator): void\n- {\n- $this->urlGenerator = $urlGenerator;\n- }\n-\npublic function getDefinition(): ?ContentType\n{\nreturn $this->contentTypeDefinition;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Entity/ContentMagicTraits.php",
"new_path": "src/Entity/ContentMagicTraits.php",
"diff": "@@ -6,10 +6,14 @@ namespace Bolt\\Entity;\nuse Bolt\\Entity\\Field\\Excerptable;\nuse Bolt\\Helpers\\Excerpt;\n+use Symfony\\Component\\Routing\\Generator\\UrlGeneratorInterface;\nuse Twig_Markup;\ntrait ContentMagicTraits\n{\n+ /** @var UrlGeneratorInterface */\n+ private $urlGenerator;\n+\npublic function __toString(): string\n{\nreturn sprintf('Content # %d', $this->getId());\n@@ -70,6 +74,11 @@ trait ContentMagicTraits\nreturn false;\n}\n+ public function setUrlGenerator(UrlGeneratorInterface $urlGenerator): void\n+ {\n+ $this->urlGenerator = $urlGenerator;\n+ }\n+\npublic function magicLink()\n{\nreturn $this->urlGenerator->generate('record', ['slug' => $this->getSlug()]);\n@@ -128,7 +137,7 @@ trait ContentMagicTraits\nreturn $title;\n}\n- public function magicImage(): array\n+ public function magicImage(): ?array\n{\nforeach ($this->getFields() as $field) {\nif ($field->getDefinition()->get('type') === 'image') {\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
move UrlGenerator to magic trait
|
95,144 |
11.01.2019 17:19:13
| -3,600 |
883fa8b4864ff8a434de3011011f2463dc620ab3
|
Store locale correctly from Profile
|
[
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/ProfileController.php",
"new_path": "src/Controller/Backend/ProfileController.php",
"diff": "@@ -4,6 +4,7 @@ declare(strict_types=1);\nnamespace Bolt\\Controller\\Backend;\n+use Bolt\\Common\\Json;\nuse Bolt\\Controller\\BaseController;\nuse Doctrine\\Common\\Persistence\\ObjectManager;\nuse Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\Security;\n@@ -50,7 +51,7 @@ class ProfileController extends BaseController\n$user = $this->getUser();\n$displayName = $user->getDisplayName();\n$url = $urlGenerator->generate('bolt_profile_edit');\n- $locale = current($request->get('locale'));\n+ $locale = Json::findScalar($request->get('locale'));\n$newPassword = $request->get('password');\n$user->setDisplayName($request->get('displayName'));\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Store locale correctly from Profile
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.