텍스트 비교

두 텍스트 파일의 차이점을 찾아보세요

실시간 편집

공백 변경 숨기기

변경 없는 행 숨기기

줄바꿈 비활성화

레이아웃

비교 단위

텍스트 스타일

구문 강조

Diffchecker Desktop 가장 안전하게 Diffchecker를 사용하는 방법. 데스크톱 앱을 사용하면 비교 데이터가 외부로 전송되지 않습니다!데스크톱 앱 받기

Untitled diff

생성일 8년 전비교 결과 만료 없음

26 삭제

행
총
삭제

글자
총
삭제

이 기능을 계속 사용하려면 업그레이드해 주세요 Diffchecker Pro 요금제 보기

31 행

35 추가

행
총
추가

글자
총
추가

이 기능을 계속 사용하려면 업그레이드해 주세요 Diffchecker Pro 요금제 보기

38 행

protected function getDoctrine_Orm_DefaultEntityManagerService($lazyLoad = true)

{

$a = new \Doctrine\ORM\Configuration();

$a = ($this->services['doctrine.dbal.default_connection'] ?? $this->getDoctrine_Dbal_DefaultConnectionService());

$b = new \Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain();

$c = new \Doctrine\ORM\Mapping\Driver\SimplifiedXmlDriver(array(($this->targetDirs[0].'/msgphp/doctrine-mapping') => 'MsgPhp'));

$c->setGlobalBasename('mapping');

$b->addDriver($c, 'MsgPhp');

$b->addDriver(new \Doctrine\ORM\Mapping\Driver\AnnotationDriver(($this->privates['annotations.cached_reader'] ?? $this->getAnnotations_CachedReaderService()), array(0 => '/app/src/Entity')), 'App\\Entity');

$a->setEntityNamespaces(array('msgphp' => 'MsgPhp', 'App' => 'App\\Entity'));

$a->setMetadataCacheImpl(($this->services['doctrine_cache.providers.doctrine.orm.default_metadata_cache'] ?? $this->getDoctrineCache_Providers_Doctrine_Orm_DefaultMetadataCacheService()));

$a->setQueryCacheImpl(($this->services['doctrine_cache.providers.doctrine.orm.default_query_cache'] ?? $this->getDoctrineCache_Providers_Doctrine_Orm_DefaultQueryCacheService()));

$a->setResultCacheImpl(($this->services['doctrine_cache.providers.doctrine.orm.default_result_cache'] ?? $this->getDoctrineCache_Providers_Doctrine_Orm_DefaultResultCacheService()));

$a->setMetadataDriverImpl($b);

$a->setProxyDir(($this->targetDirs[0].'/doctrine/orm/Proxies'));

$a->setProxyNamespace('Proxies');

$a->setAutoGenerateProxyClasses(true);

$a->setClassMetadataFactoryName('Doctrine\\ORM\\Mapping\\ClassMetadataFactory');

$a->setDefaultRepositoryClassName('Doctrine\\ORM\\EntityRepository');

$a->setNamingStrategy(new \Doctrine\ORM\Mapping\UnderscoreNamingStrategy());

$a->setQuoteStrategy(new \Doctrine\ORM\Mapping\DefaultQuoteStrategy());

$a->setEntityListenerResolver(($this->services['doctrine.orm.default_entity_listener_resolver'] ?? $this->getDoctrine_Orm_DefaultEntityListenerResolverService()));

$a->setRepositoryFactory(new \Doctrine\Bundle\DoctrineBundle\Repository\ContainerRepositoryFactory(new \Symfony\Component\DependencyInjection\ServiceLocator(array())));

$a->addCustomHydrationMode('msgphp_scalar', 'MsgPhp\\Domain\\Infra\\Doctrine\\Hydration\\ScalarHydrator');

$a->addCustomHydrationMode('msgphp_single_scalar', 'MsgPhp\\Domain\\Infra\\Doctrine\\Hydration\\SingleScalarHydrator');

$this->services['doctrine.orm.default_entity_manager'] = $instance = \Doctrine\ORM\EntityManager::create(($this->services['doctrine.dbal.default_connection'] ?? $this->getDoctrine_Dbal_DefaultConnectionService()), $a);

if (isset($this->services['doctrine.orm.default_entity_manager'])) {

return $this->services['doctrine.orm.default_entity_manager'];

}

$b = new \Doctrine\ORM\Configuration();

$this->services['doctrine.orm.default_entity_manager'] = $instance = \Doctrine\ORM\EntityManager::create($a, $b);

$c = new \Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain();

$d = new \Doctrine\ORM\Mapping\Driver\SimplifiedXmlDriver(array(($this->targetDirs[0].'/msgphp/doctrine-mapping') => 'MsgPhp'));

$d->setGlobalBasename('mapping');

$c->addDriver($d, 'MsgPhp');

$c->addDriver(new \Doctrine\ORM\Mapping\Driver\AnnotationDriver(($this->privates['annotations.cached_reader'] ?? $this->getAnnotations_CachedReaderService()), array(0 => '/app/src/Entity')), 'App\\Entity');

$b->setEntityNamespaces(array('msgphp' => 'MsgPhp', 'App' => 'App\\Entity'));

$b->setMetadataCacheImpl(($this->services['doctrine_cache.providers.doctrine.orm.default_metadata_cache'] ?? $this->getDoctrineCache_Providers_Doctrine_Orm_DefaultMetadataCacheService()));

$b->setQueryCacheImpl(($this->services['doctrine_cache.providers.doctrine.orm.default_query_cache'] ?? $this->getDoctrineCache_Providers_Doctrine_Orm_DefaultQueryCacheService()));

$b->setResultCacheImpl(($this->services['doctrine_cache.providers.doctrine.orm.default_result_cache'] ?? $this->getDoctrineCache_Providers_Doctrine_Orm_DefaultResultCacheService()));

$b->setMetadataDriverImpl($c);

$b->setProxyDir(($this->targetDirs[0].'/doctrine/orm/Proxies'));

$b->setProxyNamespace('Proxies');

$b->setAutoGenerateProxyClasses(true);

$b->setClassMetadataFactoryName('Doctrine\\ORM\\Mapping\\ClassMetadataFactory');

$b->setDefaultRepositoryClassName('Doctrine\\ORM\\EntityRepository');

$b->setNamingStrategy(new \Doctrine\ORM\Mapping\UnderscoreNamingStrategy());

$b->setQuoteStrategy(new \Doctrine\ORM\Mapping\DefaultQuoteStrategy());

$b->setEntityListenerResolver(($this->services['doctrine.orm.default_entity_listener_resolver'] ?? $this->getDoctrine_Orm_DefaultEntityListenerResolverService()));

$b->setRepositoryFactory(new \Doctrine\Bundle\DoctrineBundle\Repository\ContainerRepositoryFactory(new \Symfony\Component\DependencyInjection\ServiceLocator(array())));

$b->addCustomHydrationMode('msgphp_scalar', 'MsgPhp\\Domain\\Infra\\Doctrine\\Hydration\\ScalarHydrator');

$b->addCustomHydrationMode('msgphp_single_scalar', 'MsgPhp\\Domain\\Infra\\Doctrine\\Hydration\\SingleScalarHydrator');

(new \Doctrine\Bundle\DoctrineBundle\ManagerConfigurator(array(), array()))->configure($instance);

return $instance;

}

저장된 비교 결과

원본

파일 열기

protected function getDoctrine_Orm_DefaultEntityManagerService($lazyLoad = true)
    {
        $a = new \Doctrine\ORM\Configuration();
        $b = new \Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain();
        $c = new \Doctrine\ORM\Mapping\Driver\SimplifiedXmlDriver(array(($this->targetDirs[0].'/msgphp/doctrine-mapping') => 'MsgPhp'));
        $c->setGlobalBasename('mapping');
        $b->addDriver($c, 'MsgPhp');
        $b->addDriver(new \Doctrine\ORM\Mapping\Driver\AnnotationDriver(($this->privates['annotations.cached_reader'] ?? $this->getAnnotations_CachedReaderService()), array(0 => '/app/src/Entity')), 'App\\Entity');
        $a->setEntityNamespaces(array('msgphp' => 'MsgPhp', 'App' => 'App\\Entity'));
        $a->setMetadataCacheImpl(($this->services['doctrine_cache.providers.doctrine.orm.default_metadata_cache'] ?? $this->getDoctrineCache_Providers_Doctrine_Orm_DefaultMetadataCacheService()));
        $a->setQueryCacheImpl(($this->services['doctrine_cache.providers.doctrine.orm.default_query_cache'] ?? $this->getDoctrineCache_Providers_Doctrine_Orm_DefaultQueryCacheService()));
        $a->setResultCacheImpl(($this->services['doctrine_cache.providers.doctrine.orm.default_result_cache'] ?? $this->getDoctrineCache_Providers_Doctrine_Orm_DefaultResultCacheService()));
        $a->setMetadataDriverImpl($b);
        $a->setProxyDir(($this->targetDirs[0].'/doctrine/orm/Proxies'));
        $a->setProxyNamespace('Proxies');
        $a->setAutoGenerateProxyClasses(true);
        $a->setClassMetadataFactoryName('Doctrine\\ORM\\Mapping\\ClassMetadataFactory');
        $a->setDefaultRepositoryClassName('Doctrine\\ORM\\EntityRepository');
        $a->setNamingStrategy(new \Doctrine\ORM\Mapping\UnderscoreNamingStrategy());
        $a->setQuoteStrategy(new \Doctrine\ORM\Mapping\DefaultQuoteStrategy());
        $a->setEntityListenerResolver(($this->services['doctrine.orm.default_entity_listener_resolver'] ?? $this->getDoctrine_Orm_DefaultEntityListenerResolverService()));
        $a->setRepositoryFactory(new \Doctrine\Bundle\DoctrineBundle\Repository\ContainerRepositoryFactory(new \Symfony\Component\DependencyInjection\ServiceLocator(array())));
        $a->addCustomHydrationMode('msgphp_scalar', 'MsgPhp\\Domain\\Infra\\Doctrine\\Hydration\\ScalarHydrator');
        $a->addCustomHydrationMode('msgphp_single_scalar', 'MsgPhp\\Domain\\Infra\\Doctrine\\Hydration\\SingleScalarHydrator');

(new \Doctrine\Bundle\DoctrineBundle\ManagerConfigurator(array(), array()))->configure($instance);

return $instance;
    }

수정본

파일 열기

protected function getDoctrine_Orm_DefaultEntityManagerService($lazyLoad = true)
    {
        $a = ($this->services['doctrine.dbal.default_connection'] ?? $this->getDoctrine_Dbal_DefaultConnectionService());

if (isset($this->services['doctrine.orm.default_entity_manager'])) {
            return $this->services['doctrine.orm.default_entity_manager'];
        }

$b = new \Doctrine\ORM\Configuration();

$this->services['doctrine.orm.default_entity_manager'] = $instance = \Doctrine\ORM\EntityManager::create($a, $b);

$c = new \Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain();
        $d = new \Doctrine\ORM\Mapping\Driver\SimplifiedXmlDriver(array(($this->targetDirs[0].'/msgphp/doctrine-mapping') => 'MsgPhp'));
        $d->setGlobalBasename('mapping');
        $c->addDriver($d, 'MsgPhp');
        $c->addDriver(new \Doctrine\ORM\Mapping\Driver\AnnotationDriver(($this->privates['annotations.cached_reader'] ?? $this->getAnnotations_CachedReaderService()), array(0 => '/app/src/Entity')), 'App\\Entity');
        $b->setEntityNamespaces(array('msgphp' => 'MsgPhp', 'App' => 'App\\Entity'));
        $b->setMetadataCacheImpl(($this->services['doctrine_cache.providers.doctrine.orm.default_metadata_cache'] ?? $this->getDoctrineCache_Providers_Doctrine_Orm_DefaultMetadataCacheService()));
        $b->setQueryCacheImpl(($this->services['doctrine_cache.providers.doctrine.orm.default_query_cache'] ?? $this->getDoctrineCache_Providers_Doctrine_Orm_DefaultQueryCacheService()));
        $b->setResultCacheImpl(($this->services['doctrine_cache.providers.doctrine.orm.default_result_cache'] ?? $this->getDoctrineCache_Providers_Doctrine_Orm_DefaultResultCacheService()));
        $b->setMetadataDriverImpl($c);
        $b->setProxyDir(($this->targetDirs[0].'/doctrine/orm/Proxies'));
        $b->setProxyNamespace('Proxies');
        $b->setAutoGenerateProxyClasses(true);
        $b->setClassMetadataFactoryName('Doctrine\\ORM\\Mapping\\ClassMetadataFactory');
        $b->setDefaultRepositoryClassName('Doctrine\\ORM\\EntityRepository');
        $b->setNamingStrategy(new \Doctrine\ORM\Mapping\UnderscoreNamingStrategy());
        $b->setQuoteStrategy(new \Doctrine\ORM\Mapping\DefaultQuoteStrategy());
        $b->setEntityListenerResolver(($this->services['doctrine.orm.default_entity_listener_resolver'] ?? $this->getDoctrine_Orm_DefaultEntityListenerResolverService()));
        $b->setRepositoryFactory(new \Doctrine\Bundle\DoctrineBundle\Repository\ContainerRepositoryFactory(new \Symfony\Component\DependencyInjection\ServiceLocator(array())));
        $b->addCustomHydrationMode('msgphp_scalar', 'MsgPhp\\Domain\\Infra\\Doctrine\\Hydration\\ScalarHydrator');
        $b->addCustomHydrationMode('msgphp_single_scalar', 'MsgPhp\\Domain\\Infra\\Doctrine\\Hydration\\SingleScalarHydrator');

(new \Doctrine\Bundle\DoctrineBundle\ManagerConfigurator(array(), array()))->configure($instance);

return $instance;
    }