Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade for Cake 3.0 #38

Merged
merged 11 commits into from
Aug 2, 2015
Merged

Upgrade for Cake 3.0 #38

merged 11 commits into from
Aug 2, 2015

Conversation

ADmad
Copy link
Member

@ADmad ADmad commented Jun 9, 2015

Doh, I used git mv to move all files to new location yet it shows old ones as deleted :(

  • The component needs to be updated to account for the fact that data array won't have model name keys anymore. Component was removed
  • Support for _serialize = true should be added as done for JsonView in Cake 3.1

For now I am not raising my hand to take care of either :)

@josegonzalez
Copy link
Member

You need to move the files in 1 commit, then make changes in another.

@ADmad
Copy link
Member Author

ADmad commented Jun 9, 2015

Lesson learned for future, not going to spend time again on this one.

Conflicts:
	src/Controller/Component/CsvViewComponent.php
	src/View/CsvView.php
	tests/TestCase/Controller/Component/CsvViewComponentTest.php
	tests/TestCase/View/CsvViewTest.php
@ADmad
Copy link
Member Author

ADmad commented Jun 9, 2015

Got back history https://github.com/FriendsOfCake/cakephp-csvview/blame/2.0/src/View/CsvView.php though not really useful due to the white space change.

@jadb jadb added this to the 2.0 milestone Jun 10, 2015
@ADmad ADmad mentioned this pull request Jul 7, 2015
@ADmad
Copy link
Member Author

ADmad commented Aug 2, 2015

@josegonzalez This is good to go imo. The component isn't essential for using the View class itself, so I suggest just drop it for now. It can be reintroduced later.

@josegonzalez
Copy link
Member

Remove the component. I was never fond of it anyhow - I don't know why I even merged it in the first place...

@ADmad
Copy link
Member Author

ADmad commented Aug 2, 2015

Done

josegonzalez added a commit that referenced this pull request Aug 2, 2015
@josegonzalez josegonzalez merged commit 5364157 into master Aug 2, 2015
@htstudios
Copy link

So the 3.c branch is in a usable state now?

@ADmad
Copy link
Member Author

ADmad commented Nov 20, 2015

Yes, or at least should be :)

@josegonzalez
Copy link
Member

You probably want master for 3.x support.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants