Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: SplashSync/Widgets-Bundle
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.1.0
Choose a base ref
...
head repository: SplashSync/Widgets-Bundle
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 6 commits
  • 79 files changed
  • 1 contributor

Commits on Sep 23, 2020

  1. WIP: Sf4 Compat

    BadPixxel committed Sep 23, 2020
    Copy the full SHA
    864c5b6 View commit details

Commits on Sep 24, 2020

  1. WIP: Sf4 Compat

    BadPixxel committed Sep 24, 2020
    Copy the full SHA
    78ff864 View commit details

Commits on Dec 5, 2020

  1. WIP: Sf4 Compat

    BadPixxel committed Dec 5, 2020
    Copy the full SHA
    9f00d84 View commit details

Commits on Dec 10, 2020

  1. FIX: Yaml Strict

    BadPixxel committed Dec 10, 2020
    Copy the full SHA
    6c11e1d View commit details

Commits on Jun 22, 2021

  1. WIP: Migrate to GitLab

    BadPixxel committed Jun 22, 2021
    Copy the full SHA
    deef027 View commit details
  2. WIP: Migrate to GitLab

    BadPixxel committed Jun 22, 2021
    Copy the full SHA
    0ffe716 View commit details
Showing with 3,736 additions and 1,777 deletions.
  1. +101 −0 .gitlab-ci.yml
  2. +5 −4 app/AppKernel.php
  3. +1 −3 app/autoload.php
  4. +4 −18 composer.json
  5. +2,859 −1,177 composer.lock
  6. +8 −9 grumphp.yml
  7. +29 −12 src/Block/WidgetBlock.php
  8. +30 −15 src/Block/WidgetCollectionBlock.php
  9. +52 −40 src/Controller/CollectionController.php
  10. +72 −84 src/Controller/DemoController.php
  11. +76 −46 src/Controller/EditController.php
  12. +28 −19 src/Controller/ListController.php
  13. +59 −30 src/Controller/ViewController.php
  14. +2 −5 src/DependencyInjection/Configuration.php
  15. +1 −3 src/DependencyInjection/SplashWidgetsExtension.php
  16. +1 −3 src/Entity/Widget.php
  17. +1 −3 src/Entity/WidgetCache.php
  18. +1 −3 src/Entity/WidgetCollection.php
  19. +1 −3 src/Event/ListingEvent.php
  20. +1 −3 src/Form/WidgetDatesType.php
  21. +1 −3 src/Form/WidgetOptionsType.php
  22. +29 −7 src/Models/Blocks/BaseBlock.php
  23. +1 −3 src/Models/Blocks/MorrisAreaBlock.php
  24. +1 −3 src/Models/Blocks/MorrisBarBlock.php
  25. +1 −3 src/Models/Blocks/MorrisBaseBlock.php
  26. +1 −3 src/Models/Blocks/MorrisDonutBlock.php
  27. +1 −3 src/Models/Blocks/MorrisLineBlock.php
  28. +1 −3 src/Models/Blocks/NotificationsBlock.php
  29. +1 −3 src/Models/Blocks/SparkBarChartBlock.php
  30. +1 −3 src/Models/Blocks/SparkInfoBlock.php
  31. +1 −3 src/Models/Blocks/SparkLineChartBlock.php
  32. +1 −3 src/Models/Blocks/TableBlock.php
  33. +1 −3 src/Models/Blocks/TextBlock.php
  34. +5 −4 src/Models/Demo/Blocks/Dates.php
  35. +1 −3 src/Models/Demo/Blocks/MorrisArea.php
  36. +1 −3 src/Models/Demo/Blocks/MorrisBar.php
  37. +1 −3 src/Models/Demo/Blocks/MorrisDonut.php
  38. +1 −3 src/Models/Demo/Blocks/MorrisLine.php
  39. +1 −3 src/Models/Demo/Blocks/Notifications.php
  40. +1 −3 src/Models/Demo/Blocks/SparkBar.php
  41. +1 −3 src/Models/Demo/Blocks/SparkInfos.php
  42. +1 −3 src/Models/Demo/Blocks/SparkLine.php
  43. +3 −3 src/Models/Demo/Blocks/Table.php
  44. +1 −3 src/Models/Demo/Blocks/Text.php
  45. +1 −3 src/Models/Interfaces/WidgetProviderInterface.php
  46. +2 −4 src/Models/Traits/AccessTrait.php
  47. +1 −3 src/Models/Traits/ActionsTrait.php
  48. +1 −3 src/Models/Traits/BlocksTrait.php
  49. +8 −12 src/Models/Traits/CacheTrait.php
  50. +1 −3 src/Models/Traits/CollectionTrait.php
  51. +1 −3 src/Models/Traits/DefinitionTrait.php
  52. +1 −3 src/Models/Traits/LifecycleTrait.php
  53. +8 −5 src/Models/Traits/OptionsTrait.php
  54. +1 −3 src/Models/Traits/ParametersTrait.php
  55. +1 −3 src/Models/Traits/PositionTrait.php
  56. +5 −4 src/Models/WidgetBase.php
  57. +1 −3 src/Models/WidgetCacheBase.php
  58. +1 −3 src/Models/WidgetCollectionBase.php
  59. +5 −4 src/Repository/WidgetCacheRepository.php
  60. +3 −3 src/Resources/config/blocks.yml
  61. +16 −12 src/Resources/config/services.yml
  62. +55 −24 src/Services/CollectionService.php
  63. +11 −9 src/Services/Demo/SamplesFactoryService.php
  64. +22 −8 src/Services/FactoryService.php
  65. +62 −27 src/Services/ManagerService.php
  66. +1 −3 src/SplashWidgetsBundle.php
  67. +1 −3 tests/Blocks/Test.php
  68. +11 −6 tests/Controller/A001InitialisationControllerTest.php
  69. +15 −6 tests/Controller/A002WidgetFactoryServiceTest.php
  70. +40 −11 tests/Controller/A003WidgetManagerServiceTest.php
  71. +1 −3 tests/Controller/B001ViewControllerTest.php
  72. +33 −11 tests/Controller/B002EditControllerTest.php
  73. +1 −3 tests/Controller/D001DemoControllerTest.php
  74. +1 −3 tests/Services/SamplesFactoryService.php
  75. +8 −6 tests/Traits/ContainerAwareTrait.php
  76. +22 −15 tests/Traits/UrlCheckerTrait.php
  77. +3 −2 tests/grumphp/phpstan.neon
  78. +1 −3 web/app.php
  79. +1 −3 web/app_test.php
101 changes: 101 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
################################################################################
#
# This file is part of SplashSync Project.
#
# Copyright (C) Splash Sync <www.splashsync.com>
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
#
# For the full copyright and license information, please view the LICENSE
# file that was distributed with this source code.
#
# @author Bernard Paquier <contact@splashsync.com>
#
################################################################################

################################################################
# Set any variables we need
variables:
COMPOSER_MEMORY_LIMIT: -1
SYMFONY_DEPRECATIONS_HELPER: disabled

################################################################
# Defined Pipeline Stages
stages:
- tests
# - deploy

################################################################
# Functional Tests
################################################################

.core_tests: &core_tests
stage: tests
tags:
- Dedicated
################################################################################
# Install & Configure Environment
before_script:
# Setup Travis
- curl -s https://raw.githubusercontent.com/BadPixxel/Php-Sdk/main/ci/configure.sh | sh
# Deploy Symfony Files
- curl -s https://raw.githubusercontent.com/BadPixxel/Php-Sdk/main/symfony/deploy.sh | sh
# Setup Symfony Version & Create Database
- curl -s https://raw.githubusercontent.com/BadPixxel/Php-Sdk/main/symfony/configure.sh | sh
# Install Symfony
- curl -s https://raw.githubusercontent.com/BadPixxel/Php-Sdk/main/symfony/install.sh | sh

################################################################################
# Run Test Script
script:
# Execute Grumphp Testsuite
- curl -s https://raw.githubusercontent.com/BadPixxel/Php-Sdk/main/ci/grumphp.sh | sh
# Execute PhpUnit Tests
- vendor/bin/phpunit

################################################################################
# Run After Script
after_script:
- curl -s https://raw.githubusercontent.com/BadPixxel/Php-Sdk/main/ci/after.sh | sh

tests:php-7.4:
image: registry.gitlab.com/badpixxel-projects/php-sdk:php-7.4
<<: *core_tests

tests:php-7.3:
image: registry.gitlab.com/badpixxel-projects/php-sdk:php-7.3
<<: *core_tests

tests:php-7.2:
image: registry.gitlab.com/badpixxel-projects/php-sdk:php-7.2
<<: *core_tests

#tests:php-8.0:
# image: registry.gitlab.com/badpixxel-projects/php-sdk:php-8.0
# allow_failure: true
# <<: *core_tests

################################################################
# Build Documentation
################################################################
#pages:
# image: registry.gitlab.com/badpixxel-projects/php-sdk:jekyll
# stage: deploy
# tags:
# - Dedicated
# services:
# - docker:dind
# ################################################################################
# # Run Test Script
# script:
# # Deploy Symfony Files
# - curl -s https://raw.githubusercontent.com/BadPixxel/Php-Sdk/main/symfony/deploy.sh | sh
# # Run Composer to Build deps
# - curl -s https://raw.githubusercontent.com/BadPixxel/Php-Sdk/main/ci/composer.sh | bash
# # Build Documentation
# - php vendor/bin/grumphp run --tasks=build-docs
# artifacts:
# paths:
# - public
9 changes: 5 additions & 4 deletions app/AppKernel.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<?php

/*
* This file is part of SplashSync Project.
*
* Copyright (C) 2015-2020 Splash Sync <www.splashsync.com>
* Copyright (C) 2021 BadPixxel <www.badpixxel.com>
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,6 +18,8 @@

/**
* Widgets Demo Symfony App Kernel
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class AppKernel extends Kernel
{
@@ -60,7 +60,8 @@ public function registerBundles()
$bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
}

if (('dev' === $this->getEnvironment()) && class_exists("\\Symfony\\Bundle\\WebServerBundle\\WebServerBundle")) {
if (('dev' === $this->getEnvironment())
&& class_exists("\\Symfony\\Bundle\\WebServerBundle\\WebServerBundle")) {
$bundles[] = new Symfony\Bundle\WebServerBundle\WebServerBundle();
}
}
4 changes: 1 addition & 3 deletions app/autoload.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<?php

/*
* This file is part of SplashSync Project.
*
* Copyright (C) 2015-2020 Splash Sync <www.splashsync.com>
* Copyright (C) 2021 BadPixxel <www.badpixxel.com>
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
22 changes: 4 additions & 18 deletions composer.json
Original file line number Diff line number Diff line change
@@ -30,6 +30,8 @@

"require": {
"php": "~7.2",
"ext-json": "*",

"symfony/monolog-bundle": "^2.0|^3.0",

"doctrine/orm": "^2.5",
@@ -55,24 +57,8 @@

"splash/php-bundle": "dev-master",
"splash/console": "dev-master",

"composer/composer": "^1.5",
"j13k/yaml-lint": "^1.1",
"jakub-onderka/php-parallel-lint": "^1.0",
"phpmd/phpmd": "*",
"phpro/grumphp": "^0.16",
"sclable/xml-lint": "^0.2.4",
"sebastian/phpcpd": ">3.0",
"seld/jsonlint": "^1.7",
"sensiolabs/security-checker": "*",
"squizlabs/php_codesniffer": "^3.2",
"escapestudios/symfony2-coding-standard": "^3.4",
"friendsofphp/php-cs-fixer": "*",

"phpstan/phpstan": "^0.12",
"phpstan/phpstan-doctrine": "^0.12",
"phpstan/phpstan-phpunit": "^0.12",
"phpstan/phpstan-symfony": "^0.12"

"badpixxel/php-sdk": "dev-main"
},

"scripts": {
Loading