diff --git a/composer.lock b/composer.lock index 3b85c4c..e2ceac6 100644 --- a/composer.lock +++ b/composer.lock @@ -217,10 +217,9 @@ ], "authors": [ { - "name": "Jonathan H. Wage", + "name": "Jonathan Wage", "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/", - "role": "Creator" + "homepage": "http://www.jwage.com/" }, { "name": "Guilherme Blanco", @@ -292,7 +291,7 @@ ], "authors": [ { - "name": "Jonathan H. Wage", + "name": "Jonathan Wage", "email": "jonwage@gmail.com", "homepage": "http://www.jwage.com/", "role": "Creator" @@ -434,8 +433,7 @@ { "name": "Jonathan Wage", "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/", - "role": "Creator" + "homepage": "http://www.jwage.com/" }, { "name": "Guilherme Blanco", @@ -530,12 +528,12 @@ "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "2a37b007dda8e21bdbb8fa445be8fa0064199e13" + "reference": "2.3.4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/2a37b007dda8e21bdbb8fa445be8fa0064199e13", - "reference": "2a37b007dda8e21bdbb8fa445be8fa0064199e13", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/2.3.4", + "reference": "2.3.4", "shasum": "" }, "require": { @@ -561,8 +559,7 @@ { "name": "Jonathan Wage", "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/", - "role": "Creator" + "homepage": "http://www.jwage.com/" }, { "name": "Guilherme Blanco", @@ -595,25 +592,25 @@ "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "765b0d87fcc3e839c74817b7211258cbef3a4fb9" + "reference": "v1.2.0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/765b0d87fcc3e839c74817b7211258cbef3a4fb9", - "reference": "765b0d87fcc3e839c74817b7211258cbef3a4fb9", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/v1.2.0", + "reference": "v1.2.0", "shasum": "" }, "require": { "doctrine/dbal": ">=2.2,<2.5-dev", - "jdorn/sql-formatter": "~1.1", + "jdorn/sql-formatter": ">=1.1,<2.0", "php": ">=5.3.2", - "symfony/doctrine-bridge": "~2.2", - "symfony/framework-bundle": "~2.2" + "symfony/doctrine-bridge": ">=2.2,<3.0", + "symfony/framework-bundle": ">=2.2,<3.0" }, "require-dev": { "doctrine/orm": ">=2.2,<2.5-dev", - "symfony/validator": "~2.2", - "symfony/yaml": "~2.2" + "symfony/validator": ">=2.2,<3.0", + "symfony/yaml": ">=2.2,<3.0" }, "suggest": { "doctrine/orm": "The Doctrine ORM integration is optional in the bundle.", @@ -637,9 +634,7 @@ "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org", - "role": "Lead Developer" + "email": "fabien@symfony.com" }, { "name": "Symfony Community", @@ -751,8 +746,7 @@ { "name": "Jonathan Wage", "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/", - "role": "Creator" + "homepage": "http://www.jwage.com/" }, { "name": "Guilherme Blanco", @@ -768,7 +762,7 @@ "email": "kontakt@beberlei.de" }, { - "name": "Johannes Schmitt", + "name": "Johannes M. Schmitt", "email": "schmittjoh@gmail.com", "homepage": "http://jmsyst.com", "role": "Developer of wrapped JMSSerializerBundle" @@ -1269,7 +1263,7 @@ ], "authors": [ { - "name": "Johannes M. Schmitt", + "name": "Johannes Schmitt", "email": "schmittjoh@gmail.com", "homepage": "http://jmsyst.com", "role": "Developer of wrapped JMSSerializerBundle" @@ -1287,13 +1281,13 @@ "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/schmittjoh/cg-library.git", - "reference": "ce8ef43dd6bfe6ce54e5e9844ab71be2343bf2fc" + "url": "git://github.com/schmittjoh/cg-library.git", + "reference": "1.0.0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/cg-library/zipball/ce8ef43dd6bfe6ce54e5e9844ab71be2343bf2fc", - "reference": "ce8ef43dd6bfe6ce54e5e9844ab71be2343bf2fc", + "url": "https://github.com/schmittjoh/cg-library/zipball/1.0.0", + "reference": "1.0.0", "shasum": "" }, "require": { @@ -1321,7 +1315,7 @@ "keywords": [ "code generation" ], - "time": "2012-01-02 20:40:52" + "time": "2012-01-02 12:40:52" }, { "name": "jms/di-extra-bundle", @@ -1330,20 +1324,20 @@ "source": { "type": "git", "url": "https://github.com/schmittjoh/JMSDiExtraBundle.git", - "reference": "7fffdb6c96fb922a131af06d773e1e6c5301d070" + "reference": "1.4.0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/JMSDiExtraBundle/zipball/7fffdb6c96fb922a131af06d773e1e6c5301d070", - "reference": "7fffdb6c96fb922a131af06d773e1e6c5301d070", + "url": "https://api.github.com/repos/schmittjoh/JMSDiExtraBundle/zipball/1.4.0", + "reference": "1.4.0", "shasum": "" }, "require": { "jms/aop-bundle": ">=1.0.0,<1.2-dev", "jms/metadata": "1.*", - "symfony/finder": "~2.1", - "symfony/framework-bundle": "~2.1", - "symfony/process": "~2.1" + "symfony/finder": ">=2.1,<3.0", + "symfony/framework-bundle": ">=2.1,<3.0", + "symfony/process": ">=2.1,<3.0" }, "require-dev": { "doctrine/doctrine-bundle": "*", @@ -1427,7 +1421,7 @@ ], "authors": [ { - "name": "Johannes M. Schmitt", + "name": "Johannes Schmitt", "email": "schmittjoh@gmail.com", "homepage": "http://jmsyst.com", "role": "Developer of wrapped JMSSerializerBundle" @@ -1447,13 +1441,13 @@ "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/schmittjoh/parser-lib.git", - "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d" + "url": "git://github.com/schmittjoh/parser-lib", + "reference": "1.0.0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/parser-lib/zipball/c509473bc1b4866415627af0e1c6cc8ac97fa51d", - "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d", + "url": "https://github.com/schmittjoh/parser-lib/archive/1.0.0.zip", + "reference": "1.0.0", "shasum": "" }, "require": { @@ -1484,20 +1478,20 @@ "source": { "type": "git", "url": "https://github.com/schmittjoh/JMSSecurityExtraBundle.git", - "reference": "f5f6c6df69ceae8b709e57b49fcc2a42d9280bcc" + "reference": "1.5.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/JMSSecurityExtraBundle/zipball/f5f6c6df69ceae8b709e57b49fcc2a42d9280bcc", - "reference": "f5f6c6df69ceae8b709e57b49fcc2a42d9280bcc", + "url": "https://api.github.com/repos/schmittjoh/JMSSecurityExtraBundle/zipball/1.5.1", + "reference": "1.5.1", "shasum": "" }, "require": { - "jms/aop-bundle": "~1.0", - "jms/di-extra-bundle": "~1.3", - "jms/metadata": "~1.0", - "jms/parser-lib": "~1.0", - "symfony/framework-bundle": "~2.1", + "jms/aop-bundle": ">=1.0,<2.0", + "jms/di-extra-bundle": ">=1.3,<2.0", + "jms/metadata": ">=1.0,<2.0", + "jms/parser-lib": ">=1.0,<2.0", + "symfony/framework-bundle": ">=2.1,<3.0", "symfony/security-bundle": "*" }, "require-dev": { @@ -1744,7 +1738,7 @@ { "name": "Johannes M. Schmitt", "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", + "homepage": "http://jmsyst.com", "role": "Developer of wrapped JMSSerializerBundle" } ], @@ -2057,17 +2051,17 @@ "source": { "type": "git", "url": "https://github.com/kriswallsmith/assetic.git", - "reference": "a826e4b96f5c607ff47ef61caf3826b2b1e840ec" + "reference": "v1.1.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/a826e4b96f5c607ff47ef61caf3826b2b1e840ec", - "reference": "a826e4b96f5c607ff47ef61caf3826b2b1e840ec", + "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/v1.1.1", + "reference": "v1.1.1", "shasum": "" }, "require": { "php": ">=5.3.1", - "symfony/process": "~2.1" + "symfony/process": ">=2.1,<3.0" }, "require-dev": { "cssmin/cssmin": "*", @@ -2077,9 +2071,9 @@ "leafo/scssphp": "*", "leafo/scssphp-compass": "*", "mrclay/minify": "*", - "phpunit/phpunit": "~3.7", + "phpunit/phpunit": ">=3.7,<4.0", "ptachoire/cssembed": "*", - "twig/twig": "~1.6" + "twig/twig": ">=1.6,<2.0" }, "suggest": { "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler", @@ -2404,7 +2398,7 @@ ], "authors": [ { - "name": "Johannes M. Schmitt", + "name": "Johannes Schmitt", "email": "schmittjoh@gmail.com", "homepage": "http://jmsyst.com", "role": "Developer of wrapped JMSSerializerBundle" @@ -2424,13 +2418,13 @@ "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/php-fig/log.git", - "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b" + "url": "https://github.com/php-fig/log", + "reference": "1.0.0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b", - "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b", + "url": "https://github.com/php-fig/log/archive/1.0.0.zip", + "reference": "1.0.0", "shasum": "" }, "type": "library", @@ -2493,9 +2487,7 @@ "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org", - "role": "Lead Developer" + "email": "fabien@symfony.com" } ], "description": "The base bundle for the Symfony Distributions", @@ -2542,9 +2534,7 @@ "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org", - "role": "Lead Developer" + "email": "fabien@symfony.com" } ], "description": "This bundle provides a way to configure your controllers with annotations", @@ -2596,9 +2586,7 @@ "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org", - "role": "Lead Developer" + "email": "fabien@symfony.com" } ], "description": "This bundle generates code for you", @@ -2662,27 +2650,27 @@ "source": { "type": "git", "url": "https://github.com/symfony/AsseticBundle.git", - "reference": "146dd3cb46b302bd471560471c6aaa930483dac1" + "reference": "v2.3.0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/AsseticBundle/zipball/146dd3cb46b302bd471560471c6aaa930483dac1", - "reference": "146dd3cb46b302bd471560471c6aaa930483dac1", + "url": "https://api.github.com/repos/symfony/AsseticBundle/zipball/v2.3.0", + "reference": "v2.3.0", "shasum": "" }, "require": { - "kriswallsmith/assetic": "~1.1", + "kriswallsmith/assetic": ">=1.1,<2.0", "php": ">=5.3.0", - "symfony/framework-bundle": "~2.1" + "symfony/framework-bundle": ">=2.1,<3.0" }, "require-dev": { - "symfony/class-loader": "~2.1", - "symfony/console": "~2.1", - "symfony/css-selector": "~2.1", - "symfony/dom-crawler": "~2.1", - "symfony/form": "~2.1", - "symfony/twig-bundle": "~2.1", - "symfony/yaml": "~2.1" + "symfony/class-loader": ">=2.1,<3.0", + "symfony/console": ">=2.1,<3.0", + "symfony/css-selector": ">=2.1,<3.0", + "symfony/dom-crawler": ">=2.1,<3.0", + "symfony/form": ">=2.1,<3.0", + "symfony/twig-bundle": ">=2.1,<3.0", + "symfony/yaml": ">=2.1,<3.0" }, "suggest": { "symfony/twig-bundle": "~2.1" @@ -2825,23 +2813,23 @@ "source": { "type": "git", "url": "https://github.com/symfony/MonologBundle.git", - "reference": "03ed73bc11367b3156cc21f22ac37c7f70fcd10a" + "reference": "v2.3.0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/MonologBundle/zipball/03ed73bc11367b3156cc21f22ac37c7f70fcd10a", - "reference": "03ed73bc11367b3156cc21f22ac37c7f70fcd10a", + "url": "https://api.github.com/repos/symfony/MonologBundle/zipball/v2.3.0", + "reference": "v2.3.0", "shasum": "" }, "require": { - "monolog/monolog": "~1.3", + "monolog/monolog": ">=1.3,<2.0", "php": ">=5.3.2", - "symfony/config": "~2.2-beta2", - "symfony/dependency-injection": "~2.2-beta2", - "symfony/monolog-bridge": "~2.2-beta2" + "symfony/config": ">=2.2-beta2,<3.0", + "symfony/dependency-injection": ">=2.2-beta2,<3.0", + "symfony/monolog-bridge": ">=2.2-beta2,<3.0" }, "require-dev": { - "symfony/yaml": "~2.2-beta2" + "symfony/yaml": ">=2.2-beta2,<3.0" }, "type": "symfony-bundle", "extra": { @@ -2861,9 +2849,7 @@ "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org", - "role": "Lead Developer" + "email": "fabien@symfony.com" }, { "name": "Symfony Community", @@ -3122,9 +3108,7 @@ "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org", - "role": "Lead Developer" + "email": "fabien@symfony.com" } ], "description": "Common additional features for Twig that do not directly belong in core", @@ -3176,7 +3160,7 @@ "role": "Lead Developer" }, { - "name": "Armin Ronacher", + "name": "Armin Ronacher2", "email": "armin.ronacher@active-4.com", "role": "Project Founder" }, diff --git a/src/Cacic/CommonBundle/Entity/ComputadorRepository.php b/src/Cacic/CommonBundle/Entity/ComputadorRepository.php index 812fbe4..b9aa07a 100644 --- a/src/Cacic/CommonBundle/Entity/ComputadorRepository.php +++ b/src/Cacic/CommonBundle/Entity/ComputadorRepository.php @@ -221,7 +221,7 @@ class ComputadorRepository extends EntityRepository /* * Metodo responsável por inserir coletas iniciais, assim que o cacic é instalado */ - public function getComputadorPreCole( Request $request , $te_so , $te_node_adress ) + public function getComputadorPreCole( Request $request , $te_so , $te_node_adress, $rede, $so ) { //recebe dados via POST, deCripata dados, e attribui a variaveis $computer_system = OldCacicHelper::deCrypt( $request, $request->request->get('ComputerSystem'), true ); @@ -232,10 +232,10 @@ class ComputadorRepository extends EntityRepository $data = new \DateTime('NOW'); //armazena data Atual //vefifica se existe SO coletado se não, insere novo SO - $so = $this->getEntityManager()->getRepository('CacicCommonBundle:So')->createIfNotExist( $te_so ); - $rede = $this->getEntityManager()->getRepository('CacicCommonBundle:Rede')->getDadosRedePreColeta( $request ); + //$so = $this->getEntityManager()->getRepository('CacicCommonBundle:So')->createIfNotExist( $te_so ); + //$rede = $this->getEntityManager()->getRepository('CacicCommonBundle:Rede')->getDadosRedePreColeta( $request ); $computador = $this->findOneBy( array( 'teNodeAddress'=> $te_node_adress, 'idSo'=> $so->getIdSo()) ); - $classes = $this->getEntityManager()->getRepository('CacicCommonBundle:Classe')->findAll(); + //$classes = $this->getEntityManager()->getRepository('CacicCommonBundle:Classe')->findAll(); //inserção de dado se for um novo computador if( empty ( $computador ) ) diff --git a/src/Cacic/WSBundle/Controller/ColetaController.php b/src/Cacic/WSBundle/Controller/ColetaController.php index 9462141..0a5fe3d 100644 --- a/src/Cacic/WSBundle/Controller/ColetaController.php +++ b/src/Cacic/WSBundle/Controller/ColetaController.php @@ -360,7 +360,7 @@ class ColetaController extends Controller // Se não encontrar o valor, loga o erro e sai if (is_null($classProperty) || $classProperty == "") { - $logger->error("ERRO NA COLETA! Propriedade $classPropertyName não encontrada na requisição ou valor vazio"); + $logger->debug("ERRO NA COLETA! Propriedade $classPropertyName não encontrada na requisição ou valor vazio"); return; } diff --git a/src/Cacic/WSBundle/Controller/DefaultController.php b/src/Cacic/WSBundle/Controller/DefaultController.php index f71049c..23cbfee 100755 --- a/src/Cacic/WSBundle/Controller/DefaultController.php +++ b/src/Cacic/WSBundle/Controller/DefaultController.php @@ -74,9 +74,10 @@ class DefaultController extends Controller //vefifica se existe SO coletado se não, insere novo SO $so = $this->getDoctrine()->getRepository('CacicCommonBundle:So')->createIfNotExist( $te_so ); - $computador = $this->getDoctrine()->getRepository('CacicCommonBundle:Computador')->getComputadorPreCole( $request, $te_so, $te_node_address ); $rede = $this->getDoctrine()->getRepository('CacicCommonBundle:Rede')->getDadosRedePreColeta( $request ); - $local = $this->getDoctrine()->getRepository('CacicCommonBundle:Local')->findOneBy(array( 'idLocal' => $rede->getIdLocal() )); + $computador = $this->getDoctrine()->getRepository('CacicCommonBundle:Computador')->getComputadorPreCole( $request, $te_so, $te_node_address, $rede, $so ); + //$local = $this->getDoctrine()->getRepository('CacicCommonBundle:Local')->findOneBy(array( 'idLocal' => $rede->getIdLocal() )); + $local = $rede->getIdLocal(); //Debugging do Agente $debugging = ( TagValueHelper::getValueFromTags('DateToDebugging',$computador->getTeDebugging() ) == date("Ymd") ? $computador->getTeDebugging() : @@ -142,10 +143,11 @@ class DefaultController extends Controller OldCacicHelper::autenticaAgente($request); $te_node_adress = TagValueHelper::getValueFromTags( 'MACAddress', OldCacicHelper::deCrypt( $request, $request->get('NetworkAdapterConfiguration'))); - $computador = $this->getDoctrine()->getRepository('CacicCommonBundle:Computador')->getComputadorPreCole( $request, $request->get( 'te_so' ),$te_node_adress ); - $rede = $this->getDoctrine()->getRepository('CacicCommonBundle:Rede')->getDadosRedePreColeta( $request ); $so = $this->getDoctrine()->getRepository('CacicCommonBundle:So')->findOneBy( array('teSo'=>$request->get( 'te_so' ))); - $local = $this->getDoctrine()->getRepository('CacicCommonBundle:Local')->findOneBy(array( 'idLocal' => $rede->getIdLocal() )); + $rede = $this->getDoctrine()->getRepository('CacicCommonBundle:Rede')->getDadosRedePreColeta( $request ); + $computador = $this->getDoctrine()->getRepository('CacicCommonBundle:Computador')->getComputadorPreCole( $request, $request->get( 'te_so' ),$te_node_adress, $rede, $so ); + //$local = $this->getDoctrine()->getRepository('CacicCommonBundle:Local')->findOneBy(array( 'idLocal' => $rede->getIdLocal() )); + $local = $rede->getIdLocal(); $data = new \DateTime('NOW'); //Debugging do Agente diff --git a/src/Cacic/WSBundle/Helper/TagValueHelper.php b/src/Cacic/WSBundle/Helper/TagValueHelper.php index 8eb51b5..afe87fe 100644 --- a/src/Cacic/WSBundle/Helper/TagValueHelper.php +++ b/src/Cacic/WSBundle/Helper/TagValueHelper.php @@ -35,7 +35,7 @@ class TagValueHelper preg_match_all("(\[" . $pStrTagLabel . "\](.+)\[\/" . $pStrTagLabel . "\])i",$pStrSource, $arrResult); // Garantir que o resultado contenha somente UTF-8 valido - $resultado = TagValueHelper::UTF8Sanitize($arrResult[1][0]); + $resultado = TagValueHelper::UTF8Sanitize(@$arrResult[1][0]); return $resultado; } -- libgit2 0.21.2