b-b3rn4rd

<?php
/**
 * Zend_Queue background job abstract class
 * 
 * @author Bernard Baltrusaitis <bernard@runawaylover.info>
 */
abstract class My_Job
{
    /**
     *

b-b3rn4rd

<?php

namespace My\Doctrine;

use Doctrine\ORM\EntityRepository;

/**
 * Custom Repository extending basic EntityRepository functionality
 * 
 * @author Bernard Baltrusaitis <bernard@runawaylover.info> 

b-b3rn4rd

<?php
namespace My\Doctrine\ORM\Tools\Console\Command\SchemaTool;

use Doctrine\ORM\Tools\Console\Command\SchemaTool\UpdateCommand as UpdateCommand2,
    Symfony\Component\Console\Input\InputArgument,
    Symfony\Component\Console\Input\InputOption,
    Symfony\Component\Console\Input\InputInterface,
    Symfony\Component\Console\Output\OutputInterface,
    Doctrine\ORM\Tools\SchemaTool,
    Doctrine\ORM\Tools\Console\MetadataFilter;

b-b3rn4rd

<?php
class My_Form extends \Zend_Form
{
    /**
     * Flatten Zend_Form error messages
     * 
     * @param \Zend_Form|null $form
     * @param array|null $messages
     * @param int $i
     * @return array 

b-b3rn4rd

<?php
namespace My;
use Doctrine\Common\Util\Inflector;

/**
 * Allow to access array properties using getters/setters
 * 
 * @method null set${Property}(mixed $value) set array property
 * @method mixed get${Property}() get array property
 * @author Bernard Baltrusaitis <bernard@runawaylover.info> 

b-b3rn4rd

<?php
namespace My\Doctrine\Hydration;

use Doctrine\ORM\Internal\Hydration\ArrayHydrator,
    My\ArrayObject as ArrayObject;

/**
 * Custom Doctrine2 hydrator, allows to access array properties using getters like
 * in ObjectHydrator
 * 

b-b3rn4rd

<?php

function array_to_tree(array $array, $parent_id = 0)
{
    $array = array_combine(array_column($array, 'id'), array_values($array));

    foreach ($array as $k => &$v) {
        if (isset($array[$v['parent_id']])) {
            $array[$v['parent_id']]['children'][$k] = &$v;
        }

b-b3rn4rd

<?php

namespace Interprac\Bundle\UtilityBundle\Form;

use Symfony\Component\Form\Form;

class FormErrors
{
    public function getArray(Form $form, $style = 'KO')
    {

b-b3rn4rd

<?php

namespace Acme\DemoBundle\Controller;

use Symfony\Bundle\FrameworkBundle\Controller\Controller;

use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;

use Symfony\Component\Security\Core\Role\SwitchUserRole;

b-b3rn4rd

// moving 71b8026 from features/project-part-2 to features/project-part-1
git checkout features/project-part-2
git revert 71b8026

// for sanity check can run git diff to between branched for particular file(s)
git difftool features/project-part-2..features/project-part-1 -- ./website/app/controllers/ExampleController.php

git push origin features/project-part-2
git checkout features/project-part-1
git cherry-pick 71b8026