Commit 278f6215 authored by Felix Herrmann's avatar Felix Herrmann
Browse files

Merge branch 'fix/uppercase' into 'master'

[FIX]

See merge request shopware/plugins/RicoDynamicFAQ!9
parents 7f0fafb4 553d44dd
......@@ -5,7 +5,7 @@ $finder = PhpCsFixer\Finder::create()
->exclude(__DIR__. '/vendor/');
$header = <<<EOF
This file is part of the "RicoDynamicFAQ" plugin for shopware.
This file is part of the "RicoDynamicFaq" plugin for shopware.
@package: RicoDynamicFaq
@copyright: (c) 2019 Wolf Utz <utz@riconet.de>, Hees riconet GmbH
@license: For the full copyright and license information,
......
<?php
/**
* This file is part of the "RicoDynamicFAQ" plugin for shopware.
* This file is part of the "RicoDynamicFaq" plugin for shopware.
* @package: RicoDynamicFaq
* @copyright: (c) 2019 Wolf Utz <utz@riconet.de>, Hees riconet GmbH
* @license: For the full copyright and license information,
* please read the LICENSE.txt file that was distributed with this source code.
*/
namespace RicoDynamicFAQ\Components\Forms;
namespace RicoDynamicFaq\Components\Forms;
use RicoDynamicFAQ\Models\Question;
use RicoDynamicFaq\Models\Question;
use Shopware\Components\Model\ModelManager;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\EmailType;
......
<?php
/**
* This file is part of the "RicoDynamicFAQ" plugin for shopware.
* This file is part of the "RicoDynamicFaq" plugin for shopware.
* @package: RicoDynamicFaq
* @copyright: (c) 2019 Wolf Utz <utz@riconet.de>, Hees riconet GmbH
* @license: For the full copyright and license information,
* please read the LICENSE.txt file that was distributed with this source code.
*/
namespace RicoDynamicFAQ\Components;
namespace RicoDynamicFaq\Components;
use Doctrine\ORM\OptimisticLockException;
use RicoDynamicFAQ\Factory\MailFactory;
use RicoDynamicFAQ\Fixtures\CategoryFixtures;
use RicoDynamicFAQ\Fixtures\QuestionFixtures;
use RicoDynamicFAQ\Loader\DatabaseLoader;
use RicoDynamicFaq\Factory\MailFactory;
use RicoDynamicFaq\Fixtures\CategoryFixtures;
use RicoDynamicFaq\Fixtures\QuestionFixtures;
use RicoDynamicFaq\Loader\DatabaseLoader;
use Shopware\Models\Mail\Mail;
use Symfony\Component\DependencyInjection\ContainerInterface;
......
<?php
/**
* This file is part of the "RicoDynamicFAQ" plugin for shopware.
* This file is part of the "RicoDynamicFaq" plugin for shopware.
* @package: RicoDynamicFaq
* @copyright: (c) 2019 Wolf Utz <utz@riconet.de>, Hees riconet GmbH
* @license: For the full copyright and license information,
* please read the LICENSE.txt file that was distributed with this source code.
*/
namespace RicoDynamicFAQ\Components;
namespace RicoDynamicFaq\Components;
use Doctrine\ORM\OptimisticLockException;
use InvalidArgumentException;
use RicoDynamicFAQ\Models\Question;
use RicoDynamicFaq\Models\Question;
use Shopware\Components\Model\ModelManager;
/**
......
<?php
/**
* This file is part of the "RicoDynamicFAQ" plugin for shopware.
* This file is part of the "RicoDynamicFaq" plugin for shopware.
* @package: RicoDynamicFaq
* @copyright: (c) 2019 Wolf Utz <utz@riconet.de>, Hees riconet GmbH
* @license: For the full copyright and license information,
......@@ -11,9 +11,9 @@ use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\OptimisticLockException;
use Doctrine\ORM\ORMException;
use Doctrine\ORM\TransactionRequiredException;
use RicoDynamicFAQ\Factory\MailFactory;
use RicoDynamicFAQ\Models\Answer;
use RicoDynamicFAQ\Models\Question;
use RicoDynamicFaq\Factory\MailFactory;
use RicoDynamicFaq\Models\Answer;
use RicoDynamicFaq\Models\Question;
/**
* Class Shopware_Controllers_Backend_Faq.
......
<?php
/**
* This file is part of the "RicoDynamicFAQ" plugin for shopware.
* This file is part of the "RicoDynamicFaq" plugin for shopware.
* @package: RicoDynamicFaq
* @copyright: (c) 2019 Wolf Utz <utz@riconet.de>, Hees riconet GmbH
* @license: For the full copyright and license information,
* please read the LICENSE.txt file that was distributed with this source code.
*/
use RicoDynamicFAQ\Models\Category;
use RicoDynamicFaq\Models\Category;
/**
* Class Shopware_Controllers_Backend_Faq.
......
<?php
/**
* This file is part of the "RicoDynamicFAQ" plugin for shopware.
* This file is part of the "RicoDynamicFaq" plugin for shopware.
* @package: RicoDynamicFaq
* @copyright: (c) 2019 Wolf Utz <utz@riconet.de>, Hees riconet GmbH
* @license: For the full copyright and license information,
* please read the LICENSE.txt file that was distributed with this source code.
*/
use RicoDynamicFAQ\Components\Forms\QuestionForm;
use RicoDynamicFAQ\Components\QuestionTracker;
use RicoDynamicFAQ\Models\Answer;
use RicoDynamicFAQ\Models\Category;
use RicoDynamicFAQ\Models\Question;
use RicoDynamicFAQ\Repository\CategoryRepository;
use RicoDynamicFAQ\Repository\QuestionRepository;
use RicoDynamicFaq\Components\Forms\QuestionForm;
use RicoDynamicFaq\Components\QuestionTracker;
use RicoDynamicFaq\Models\Answer;
use RicoDynamicFaq\Models\Category;
use RicoDynamicFaq\Models\Question;
use RicoDynamicFaq\Repository\CategoryRepository;
use RicoDynamicFaq\Repository\QuestionRepository;
use Symfony\Component\Form\FormInterface;
/**
* Class DynamicFAQ.
* Class DynamicFaq.
*/
class Shopware_Controllers_Frontend_Faq extends Enlight_Controller_Action
{
......
<?php
/**
* This file is part of the "RicoDynamicFAQ" plugin for shopware.
* This file is part of the "RicoDynamicFaq" plugin for shopware.
* @package: RicoDynamicFaq
* @copyright: (c) 2019 Wolf Utz <utz@riconet.de>, Hees riconet GmbH
* @license: For the full copyright and license information,
* please read the LICENSE.txt file that was distributed with this source code.
*/
namespace RicoDynamicFAQ\Factory;
namespace RicoDynamicFaq\Factory;
use Shopware\Models\Mail\Mail;
......
<?php
/**
* This file is part of the "RicoDynamicFAQ" plugin for shopware.
* This file is part of the "RicoDynamicFaq" plugin for shopware.
* @package: RicoDynamicFaq
* @copyright: (c) 2019 Wolf Utz <utz@riconet.de>, Hees riconet GmbH
* @license: For the full copyright and license information,
* please read the LICENSE.txt file that was distributed with this source code.
*/
namespace RicoDynamicFAQ\Fixtures;
namespace RicoDynamicFaq\Fixtures;
use Doctrine\ORM\OptimisticLockException;
use RicoDynamicFAQ\Models\Category;
use RicoDynamicFaq\Models\Category;
use Shopware\Components\Model\ModelManager;
/**
......
<?php
/**
* This file is part of the "RicoDynamicFAQ" plugin for shopware.
* This file is part of the "RicoDynamicFaq" plugin for shopware.
* @package: RicoDynamicFaq
* @copyright: (c) 2019 Wolf Utz <utz@riconet.de>, Hees riconet GmbH
* @license: For the full copyright and license information,
* please read the LICENSE.txt file that was distributed with this source code.
*/
namespace RicoDynamicFAQ\Fixtures;
namespace RicoDynamicFaq\Fixtures;
use Doctrine\ORM\EntityManager;
use Doctrine\ORM\OptimisticLockException;
use Exception;
use RicoDynamicFAQ\Models\Answer;
use RicoDynamicFAQ\Models\Category;
use RicoDynamicFAQ\Models\Question;
use RicoDynamicFaq\Models\Answer;
use RicoDynamicFaq\Models\Category;
use RicoDynamicFaq\Models\Question;
/**
* Class QuestionFixtures.
......
<?php
/**
* This file is part of the "RicoDynamicFAQ" plugin for shopware.
* This file is part of the "RicoDynamicFaq" plugin for shopware.
* @package: RicoDynamicFaq
* @copyright: (c) 2019 Wolf Utz <utz@riconet.de>, Hees riconet GmbH
* @license: For the full copyright and license information,
* please read the LICENSE.txt file that was distributed with this source code.
*/
namespace RicoDynamicFAQ\Loader;
namespace RicoDynamicFaq\Loader;
use Doctrine\ORM\Tools\SchemaTool;
use RicoDynamicFAQ\Models\Answer;
use RicoDynamicFAQ\Models\Category;
use RicoDynamicFAQ\Models\Question;
use RicoDynamicFaq\Models\Answer;
use RicoDynamicFaq\Models\Category;
use RicoDynamicFaq\Models\Question;
use Shopware\Components\Model\ModelManager;
/**
......
<?php
/**
* This file is part of the "RicoDynamicFAQ" plugin for shopware.
* This file is part of the "RicoDynamicFaq" plugin for shopware.
* @package: RicoDynamicFaq
* @copyright: (c) 2019 Wolf Utz <utz@riconet.de>, Hees riconet GmbH
* @license: For the full copyright and license information,
* please read the LICENSE.txt file that was distributed with this source code.
*/
namespace RicoDynamicFAQ\Models;
namespace RicoDynamicFaq\Models;
use Doctrine\ORM\Mapping as ORM;
use Shopware\Components\Model\ModelEntity;
......
<?php
/**
* This file is part of the "RicoDynamicFAQ" plugin for shopware.
* This file is part of the "RicoDynamicFaq" plugin for shopware.
* @package: RicoDynamicFaq
* @copyright: (c) 2019 Wolf Utz <utz@riconet.de>, Hees riconet GmbH
* @license: For the full copyright and license information,
* please read the LICENSE.txt file that was distributed with this source code.
*/
namespace RicoDynamicFAQ\Models;
namespace RicoDynamicFaq\Models;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
......@@ -17,7 +17,7 @@ use Shopware\Components\Model\ModelEntity;
/**
* Class Category.
*
* @ORM\Entity(repositoryClass="RicoDynamicFAQ\Repository\CategoryRepository")
* @ORM\Entity(repositoryClass="RicoDynamicFaq\Repository\CategoryRepository")
* @ORM\Table(name="rico_faq_category", options={"collate"="utf8_unicode_ci"})
*/
class Category extends ModelEntity
......@@ -40,7 +40,7 @@ class Category extends ModelEntity
/**
* @var Category
*
* @ORM\ManyToOne(targetEntity="RicoDynamicFAQ\Models\Category", inversedBy="children")
* @ORM\ManyToOne(targetEntity="RicoDynamicFaq\Models\Category", inversedBy="children")
* @ORM\JoinColumn(name="parent", referencedColumnName="id")
*/
protected $parent;
......@@ -48,7 +48,7 @@ class Category extends ModelEntity
/**
* @var ArrayCollection
*
* @ORM\OneToMany(targetEntity="RicoDynamicFAQ\Models\Category", mappedBy="parent")
* @ORM\OneToMany(targetEntity="RicoDynamicFaq\Models\Category", mappedBy="parent")
*/
protected $children;
......
<?php
/**
* This file is part of the "RicoDynamicFAQ" plugin for shopware.
* This file is part of the "RicoDynamicFaq" plugin for shopware.
* @package: RicoDynamicFaq
* @copyright: (c) 2019 Wolf Utz <utz@riconet.de>, Hees riconet GmbH
* @license: For the full copyright and license information,
* please read the LICENSE.txt file that was distributed with this source code.
*/
namespace RicoDynamicFAQ\Models;
namespace RicoDynamicFaq\Models;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
......@@ -17,7 +17,7 @@ use Shopware\Components\Model\ModelEntity;
/**
* Class Question.
*
* @ORM\Entity(repositoryClass="RicoDynamicFAQ\Repository\QuestionRepository")
* @ORM\Entity(repositoryClass="RicoDynamicFaq\Repository\QuestionRepository")
* @ORM\Table(name="rico_faq_question", options={"collate"="utf8_unicode_ci"})
*/
class Question extends ModelEntity
......@@ -32,7 +32,7 @@ class Question extends ModelEntity
/**
* @var Answer
*
* @ORM\OneToOne(targetEntity="RicoDynamicFAQ\Models\Answer", cascade={"persist"}, orphanRemoval=true)
* @ORM\OneToOne(targetEntity="RicoDynamicFaq\Models\Answer", cascade={"persist"}, orphanRemoval=true)
* @ORM\JoinColumn(name="answer", referencedColumnName="id")
*/
protected $answer;
......@@ -84,7 +84,7 @@ class Question extends ModelEntity
/**
* @var ArrayCollection
*
* @ORM\ManyToMany(targetEntity="RicoDynamicFAQ\Models\Category")
* @ORM\ManyToMany(targetEntity="RicoDynamicFaq\Models\Category")
* @ORM\JoinTable(name="s_rico_dynamic_faq_question_category_mm",
* joinColumns={@ORM\JoinColumn(name="question", referencedColumnName="id")},
* inverseJoinColumns={@ORM\JoinColumn(name="category", referencedColumnName="id")}
......
......@@ -3,7 +3,7 @@
# Dynamic FAQ plugin for shopware
### Dependencies
* Shopware 5.5.*
* Shopware 5.2.*
## Overview
This plugin provides a FAQ widget for your shop.
\ No newline at end of file
This plugin provides a FAQ widget for your shop.
<?php
/**
* This file is part of the "RicoDynamicFAQ" plugin for shopware.
* This file is part of the "RicoDynamicFaq" plugin for shopware.
* @package: RicoDynamicFaq
* @copyright: (c) 2019 Wolf Utz <utz@riconet.de>, Hees riconet GmbH
* @license: For the full copyright and license information,
* please read the LICENSE.txt file that was distributed with this source code.
*/
namespace RicoDynamicFAQ\Repository;
namespace RicoDynamicFaq\Repository;
use Shopware\Components\Model\ModelRepository;
......
<?php
/**
* This file is part of the "RicoDynamicFAQ" plugin for shopware.
* This file is part of the "RicoDynamicFaq" plugin for shopware.
* @package: RicoDynamicFaq
* @copyright: (c) 2019 Wolf Utz <utz@riconet.de>, Hees riconet GmbH
* @license: For the full copyright and license information,
* please read the LICENSE.txt file that was distributed with this source code.
*/
namespace RicoDynamicFAQ\Repository;
namespace RicoDynamicFaq\Repository;
use Doctrine\ORM\QueryBuilder;
use RicoDynamicFAQ\Models\Category;
use RicoDynamicFAQ\Models\Question;
use RicoDynamicFaq\Models\Category;
use RicoDynamicFaq\Models\Question;
use Shopware\Components\Model\ModelRepository;
/**
......
......@@ -4,34 +4,35 @@
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
<services>
<!-- event_subscriber -->
<service class="RicoDynamicFAQ\Subscribers\TemplateSubscriber"
<service class="RicoDynamicFaq\Subscribers\TemplateSubscriber"
id="rico_dynamic_faq.subscribers.template_subscriber">
<argument>%rico_dynamic_faq.plugin_dir%</argument>
<tag name="shopware.event_subscriber"/>
</service>
<!-- misc -->
<service class="RicoDynamicFAQ\Services\FAQConfigService" id="rico_dynamic_faq.config">
<service class="RicoDynamicFaq\Services\FaqConfigService" id="rico_dynamic_faq.config">
<argument tag="service" id="service_container"/>
</service>
<service class="RicoDynamicFAQ\Services\QueryPaginatorService" id="rico_dynamic_faq.paginator">
<service class="RicoDynamicFaq\Services\QueryPaginatorService" id="rico_dynamic_faq.paginator">
<argument type="service" id="models"/>
<argument type="service" id="shopware.plugin.cached_config_reader"/>
<argument>%rico_dynamic_faq.plugin_name%</argument>
</service>
<service class="RicoDynamicFAQ\Components\QuestionTracker" id="rico_dynamic_faq.question_tracker">
<service class="RicoDynamicFaq\Components\QuestionTracker" id="rico_dynamic_faq.question_tracker">
<argument type="service" id="models"/>
</service>
<service class="RicoDynamicFAQ\Services\TemplateMailService" id="rico_dynamic_faq.mail">
<service class="RicoDynamicFaq\Services\TemplateMailService" id="rico_dynamic_faq.mail">
<argument type="service" id="models"/>
</service>
<service class="RicoDynamicFAQ\Services\CategoryTreeService" id="rico_dynamic_faq.category_tree">
<service class="RicoDynamicFaq\Services\CategoryTreeService" id="rico_dynamic_faq.category_tree">
<argument type="service" id="models"/>
</service>
<service class="RicoDynamicFAQ\Services\CategoryQuestionTreeService"
<service class="RicoDynamicFaq\Services\CategoryQuestionTreeService"
id="rico_dynamic_faq.category_question_tree">
<argument type="service" id="models"/>
</service>
<!-- form types -->
<service class="RicoDynamicFAQ\Components\Forms\QuestionForm" id="rico_dynamic_faq.form.question">
<service class="RicoDynamicFaq\Components\Forms\QuestionForm" id="rico_dynamic_faq.form.question">
<argument type="service" id="models"/>
<tag name="form.type"/>
</service>
......
// {namespace name="backend/faq/translation"}
Ext.define('Shopware.apps.Faq.view.detail.question.Window', {
Ext.define('Shopware.apps.Faq.view.detail.Window', {
extend: 'Shopware.window.Detail',
alias: 'widget.faq-question-detail-window',
title: '{s name=question_detail}{/s}',
......
<?php
/**
* This file is part of the "RicoDynamicFAQ" plugin for shopware.
* This file is part of the "RicoDynamicFaq" plugin for shopware.
* @package: RicoDynamicFaq
* @copyright: (c) 2019 Wolf Utz <utz@riconet.de>, Hees riconet GmbH
* @license: For the full copyright and license information,
* please read the LICENSE.txt file that was distributed with this source code.
* please read the LICENSE.txt file that was distributed with this source code.
*/
namespace RicoDynamicFAQ;
namespace RicoDynamicFaq;
use RicoDynamicFAQ\Components\PluginInstaller;
use RicoDynamicFaq\Components\PluginInstaller;
use Shopware\Components\Plugin;
use Shopware\Components\Plugin\Context\InstallContext;
use Shopware\Components\Plugin\Context\UninstallContext;
/**
* Class RicoDynamicFAQ.
* Class RicoDynamicFaq.
*/
class RicoDynamicFAQ extends Plugin
class RicoDynamicFaq extends Plugin
{
/**
* {@inheritdoc}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment