Merge pull request #3 from psiphp/upgrade

Upgrading
psiphp · Nov 25, 2016 · 5899169 · 5899169
2 parents b3d9d7c + 7ddd222
commit 5899169
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/DependencyInjection/Compiler/CellPass.php b/src/DependencyInjection/Compiler/CellPass.php
@@ -7,8 +7,8 @@ class CellPass extends AbstractRegistryPass
     public function __construct()
     {
         parent::__construct(
-            'psi_grid.cell_registry',
-            'psi_grid.cell'
+            'psi_grid.column_registry',
+            'psi_grid.column'
         );
     }
 }
diff --git a/src/Resources/config/cell.xml b/src/Resources/config/cell.xml
@@ -5,20 +5,20 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="psi_grid.cell_registry" class="Psi\Component\Grid\CellRegistry" public="false" />
+        <service id="psi_grid.column_registry" class="Psi\Component\Grid\ColumnRegistry" public="false" />
 
-        <service id="psi_grid.cell_factory" class="Psi\Component\Grid\CellFactory" public="false" >
-            <argument type="service" id="psi_grid.cell_registry" />
+        <service id="psi_grid.column_factory" class="Psi\Component\Grid\ColumnFactory" public="false" >
+            <argument type="service" id="psi_grid.column_registry" />
         </service>
 
-        <!-- Cells -->
-        <service id="psi_grid.view.property" class="Psi\Component\Grid\Cell\PropertyCell" public="false">
-            <tag name="psi_grid.cell" alias="property" />
+        <!-- Columns -->
+        <service id="psi_grid.view.property" class="Psi\Component\Grid\Column\PropertyColumn" public="false">
+            <tag name="psi_grid.column" alias="property" />
         </service>
 
-        <service id="psi_grid.view.select" class="Psi\Component\Grid\Cell\SelectCell" public="false">
+        <service id="psi_grid.view.select" class="Psi\Component\Grid\Column\SelectColumn" public="false">
             <argument type="service" id="psi_object_agent.agent_finder" />
-            <tag name="psi_grid.cell" alias="select" />
+            <tag name="psi_grid.column" alias="select" />
         </service>
 
     </services>

diff --git a/src/Resources/config/grid.xml b/src/Resources/config/grid.xml
@@ -6,7 +6,7 @@
 
     <services>
         <service id="psi_grid.grid_view_factory" class="Psi\Component\Grid\GridViewFactory" public="false">
-            <argument type="service" id="psi_grid.cell_factory" />
+            <argument type="service" id="psi_grid.column_factory" />
             <argument type="service" id="psi_grid.filter_bar_factory" />
         </service>