Skip to content

Commit

Permalink
Backport CI config to 1.12 (#4465)
Browse files Browse the repository at this point in the history
  • Loading branch information
dxops authored Nov 21, 2016
1 parent be581ce commit 639268e
Show file tree
Hide file tree
Showing 14 changed files with 0 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ public function testGettersSetters()
$this->assertNull($entity->getOrganization());
$entity->setOrganization($organization);
$this->assertSame($organization, $entity->getOrganization());

}

public function testBeforeSave()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,14 @@ public function setStartDate($contact)

public function setEndDate()
{

}

public function setDescription()
{

}

public function setBudget()
{

}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ public function testBuildForm(array $entities, array $channels, callable $callba
}

$this->extension->buildForm($builder, ['entities' => $entities, 'single_channel_mode' => true]);

}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ public function setAddressFirstName($value, $addressId = 0)
$addressFirstName->value($value);

return $this;

}

public function getAddressFirstName($addressId = 0)
Expand All @@ -169,7 +168,6 @@ public function setAddressLastName($value, $addressId = 0)
$addressLastName->value($value);

return $this;

}

public function getAddressLastName($addressId = 0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ public function up(Schema $schema, QueryBag $queries)
$table->removeForeignKey('FK_6F7A50CE427EB8A5');
$table->removeForeignKey('FK_6F7A50CE50A89B2C');
$schema->dropTable('orocrm_contactus_request_calls');

}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ public function loadReports()
}

$this->flush($this->em);

}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ public function setContainer(ContainerInterface $container = null)
$this->group = $entityManager->getRepository('OroUserBundle:Group');
$this->user = $entityManager->getRepository('OroUserBundle:User');
$this->tagManager = $container->get('oro_tag.tag.manager');

}

public function load(ObjectManager $manager)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ public function postAction($customerId)
} else {
$view = $this->view($this->getForm(), Codes::HTTP_BAD_REQUEST);
}

} else {
$view = $this->view($this->getForm(), Codes::HTTP_NOT_FOUND);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ public function write(array $items)
$uniqueKeys[] = $identifier;
$uniqueItems[] = $item;
}

} else {
$uniqueItems[] = $item;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ public function testIsCompleted($status, $result)
} else {
$this->assertFalse($this->entity->isCompleted());
}

}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ public function testWebsiteConditionForStores()
$event = new BuildAfter($this->datagrid);
$this->listener->onBuildAfter($event);
$dataGrid2 = $event->getDatagrid();

}

public function testOnBuildAfterAclIntegrationAssignGranted()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,6 @@ protected function getMarketingListDataGrid(MarketingList $marketingList, $mixin
$gridParameters['grid-mixin'] = $mixin;
}
$this->dataGrid[$resultKey] = $this->dataGridManager->getDatagrid($dataGridName, $gridParameters);

}

return $this->dataGrid[$resultKey];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ protected function updateWorkflowName(LoggerInterface $logger, $dryRun)
if (!$dryRun) {
$this->connection->executeUpdate($sql, $params, $types);
}

}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ protected function initSupportingEntities()
$this->organization = $this->organizationManager
->getRepository('OroOrganizationBundle:Organization')
->getFirst();

}

/**
Expand Down

0 comments on commit 639268e

Please sign in to comment.