Commit ed71157a authored by Hermann Mayer's avatar Hermann Mayer
Browse files

Cleanup configured fixtures and configs.

parent 40f859f7
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
jity_homepage:

    search:
        enable: true

    admin:
        email:  admin@jity.de

    impress:
        site_admin:
            name: Herman Mayer
+26 −15
Original line number Diff line number Diff line
<?php

namespace Jity\HomepageBundle\DataFixtures\ORM;
/*
 * This file is part of the Jity package.
 *
 * (c) Hermann Mayer <hermann.mayer92@gmail.com>
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */

use Jity\HomepageBundle\Entity\Page;
namespace Jity\HomepageBundle\DataFixtures\ORM;

use Doctrine\Common\Persistence\ObjectManager;
use Doctrine\Common\DataFixtures\AbstractFixture;
use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
use Jity\HomepageBundle\Entity\Page,
    Doctrine\Common\Persistence\ObjectManager,
    Doctrine\Common\DataFixtures\AbstractFixture,
    Doctrine\Common\DataFixtures\OrderedFixtureInterface;

/**
 * LoadPageData
 * Load20HomePageData
 *
 * Load homepage fixtures.
 *
 * @uses   AbstractFixture
 * @uses   OrderedFixtureInterface
 * @version $id$
 * @author Hermann Mayer <hermann.mayer92@gmail.com>
 */
class Load20HomePageData extends AbstractFixture implements OrderedFixtureInterface
@@ -21,7 +30,10 @@ class Load20HomePageData extends AbstractFixture implements OrderedFixtureInterf
    /**
     * load
     *
     * @param ObjectManager $manager
     * Load the fixtures.
     *
     * @param ObjectManager $manager ObjectManager Instance
     *
     * @access public
     * @return void
     */
@@ -88,16 +100,13 @@ ein Menü, mit dessen Hilfe man zum Login-Formular gelangt. Dort müssen die
angegebenen Zugangsdaten eingegeben werden.
</p>

<br><br>

')
<br><br>')
            ->setCategory($this->getReference('default-category'))
            ->setSidebar($this->getReference('default-sidebar'))
            ->setNavigation($this->getReference('default-navigation'))
            ->setAuthor($this->getReference('admin-user'))
            ->setService($this->getReference('homepage-service'))
            ->setIcon('icon-flag')
        ;
            ->setIcon('icon-flag');

        /*
         * --------------------------------------------------------------------
@@ -115,6 +124,8 @@ angegebenen Zugangsdaten eingegeben werden.
    /**
     * getOrder
     *
     * Get the position (in order) of the fixture.
     *
     * @access public
     * @return void
     */
+58 −35
Original line number Diff line number Diff line
<?php

namespace Jity\HomepageBundle\DataFixtures\ORM;
/*
 * This file is part of the Jity package.
 *
 * (c) Hermann Mayer <hermann.mayer92@gmail.com>
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */

use Jity\HomepageBundle\Entity\User;
namespace Jity\HomepageBundle\DataFixtures\ORM;

use Doctrine\Common\Persistence\ObjectManager;
use Doctrine\Common\DataFixtures\AbstractFixture;
use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Jity\HomepageBundle\Entity\User,
    Doctrine\Common\Persistence\ObjectManager,
    Doctrine\Common\DataFixtures\AbstractFixture,
    Doctrine\Common\DataFixtures\OrderedFixtureInterface,
    Symfony\Component\DependencyInjection\ContainerAwareInterface,
    Symfony\Component\DependencyInjection\ContainerInterface;

/**
 * LoadUserData 
 * Load02UserData
 *
 * Load user fixtures.
 *
 * @uses   AbstractFixture
 * @uses   OrderedFixtureInterface
 * @uses   ContainerAwareInterface
 * @version $id$
 * @author Hermann Mayer <hermann.mayer92@gmail.com>
 */
class Load02UserData extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface
@@ -26,7 +35,10 @@ class Load02UserData extends AbstractFixture implements OrderedFixtureInterface,
    /**
     * setContainer
     *
     * @param ContainerInterface $container 
     * Set the dependency injection container.
     *
     * @param ContainerInterface $container Dependency Injection Container
     *
     * @access public
     * @return void
     */
@@ -38,17 +50,23 @@ class Load02UserData extends AbstractFixture implements OrderedFixtureInterface,
    /**
     * encodePassword
     *
     * @param User $user 
     * Encode a password with the symfony security encoder factory.
     *
     * @param User $user User to protect
     *
     * @access public
     * @return void
     * @return User
     */
    public function encodePassword(User $user)
    {
        // Generate 'admin' Password
        $encoder = $this->container->get('security.encoder_factory')->getEncoder(new User());
        $encoder = $this->container
            ->get('security.encoder_factory')
            ->getEncoder(new User());

        $user->setPassword(
            $encoder->encodePassword(strtolower($user->getFirstName()), $user->getSalt())
            $encoder->encodePassword(
                strtolower($user->getFirstName()), $user->getSalt()
            )
        );

        return $user;
@@ -57,7 +75,10 @@ class Load02UserData extends AbstractFixture implements OrderedFixtureInterface,
    /**
     * load
     *
     * @param ObjectManager $manager 
     * Load the fixtures.
     *
     * @param ObjectManager $manager ObjectManager Instance
     *
     * @access public
     * @return void
     */
@@ -75,10 +96,10 @@ class Load02UserData extends AbstractFixture implements OrderedFixtureInterface,
        $admin
            ->setEmail($config->admin['email'])
            ->setFirstName('Admin')
            ->setLastName('')
            ->setLastName('Admin')
            ->setStatus(User::STATUS_ACTIVE)
            ->addGroup($this->getReference('admin-group'))
        ;
            ->addGroup($this->getReference('admin-group'));

        $this->encodePassword($admin);

        /*
@@ -97,6 +118,8 @@ class Load02UserData extends AbstractFixture implements OrderedFixtureInterface,
    /**
     * getOrder
     *
     * Get the position (in order) of the fixture.
     *
     * @access public
     * @return void
     */